Skip to content

Commit 652ea40

Browse files
authored
Merge branch 'GregTechCEu:1.20.1' into 1.20.1
2 parents 9be1bd5 + f6ca8fd commit 652ea40

File tree

136 files changed

+749
-366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+749
-366
lines changed

CHANGELOG.md

Lines changed: 16 additions & 23 deletions

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx6G
33
# Mod Info
44
mod_id = gtceu
55
mod_name = GregTech
6-
mod_version = 1.3.0-a
6+
mod_version = 1.3.1
77
mod_description = GregTech CE Unofficial, ported from 1.12.2
88
mod_license = LGPL-3.0 license
99
mod_url = https://github.com/GregTechCEu/GregTech-Modern/

src/generated/resources/assets/gtceu/models/block/black_borderless_lamp.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"parent": "gtceu:block/lamp_borderless",
3-
"render_type": "minecraft:translucent",
43
"textures": {
54
"active": "gtceu:block/lamps/black_borderless"
65
}

src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_bloom.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"parent": "gtceu:block/lamp_borderless",
3-
"render_type": "minecraft:translucent",
43
"textures": {
54
"active": "gtceu:block/lamps/black_borderless_emissive"
65
}

src/generated/resources/assets/gtceu/models/block/black_lamp.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"parent": "gtceu:block/lamp",
3-
"render_type": "minecraft:translucent",
43
"textures": {
54
"active": "gtceu:block/lamps/black",
65
"active_overlay": "gtceu:block/lamps/black"

src/generated/resources/assets/gtceu/models/block/black_lamp_bloom.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"parent": "gtceu:block/lamp",
3-
"render_type": "minecraft:translucent",
43
"textures": {
54
"active": "gtceu:block/lamps/black",
65
"active_overlay": "gtceu:block/lamps/black_emissive"

src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"parent": "gtceu:block/lamp_borderless",
3-
"render_type": "minecraft:translucent",
43
"textures": {
54
"active": "gtceu:block/lamps/blue_borderless"
65
}

src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_bloom.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"parent": "gtceu:block/lamp_borderless",
3-
"render_type": "minecraft:translucent",
43
"textures": {
54
"active": "gtceu:block/lamps/blue_borderless_emissive"
65
}

src/generated/resources/assets/gtceu/models/block/blue_lamp.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"parent": "gtceu:block/lamp",
3-
"render_type": "minecraft:translucent",
43
"textures": {
54
"active": "gtceu:block/lamps/blue",
65
"active_overlay": "gtceu:block/lamps/blue"

src/generated/resources/assets/gtceu/models/block/blue_lamp_bloom.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"parent": "gtceu:block/lamp",
3-
"render_type": "minecraft:translucent",
43
"textures": {
54
"active": "gtceu:block/lamps/blue",
65
"active_overlay": "gtceu:block/lamps/blue_emissive"

0 commit comments

Comments
 (0)