Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.21 cherrypick #2016

Merged
merged 38 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c499c5a
add sources to publishing (#1947)
DancingSnow0517 Sep 13, 2024
45355bc
Fixed improper behaviors (#1948)
krossgg Sep 24, 2024
247c762
Tuned Tool Highlight Grid behavior (#1949)
krossgg Sep 13, 2024
a7d90be
Disables unimplemented covers (#1961)
Spicierspace153 Sep 14, 2024
62e6be4
Convert all stereo sounds to mono (#1966)
JuiceyBeans Sep 16, 2024
d065793
Sculk fixes + datagen (#1968)
JuiceyBeans Sep 17, 2024
214601c
Remove border lines from Laminated Glass CTM (#1972)
JuiceyBeans Sep 17, 2024
6e91887
Quantum Storage Fixes (#1976)
krossgg Sep 18, 2024
fae704b
Misc texture fixes (#1974)
krossgg Sep 24, 2024
98e12c1
Fix jei drag (#1973)
EasterFG Sep 19, 2024
fbbb68d
Fixed filtering on auto-transfer (#1982)
krossgg Sep 19, 2024
ffc3d6a
Steam Turbine Fix (#1983)
YoungOnionMC Sep 19, 2024
bfa54ac
Add Compressor recipe for snow balls -> snow (#1969)
Vextin Sep 20, 2024
f6d1814
Added rubber log variants to #minecraft:logs_that_burn (#1914)
a-a-GiTHuB-a-a Sep 20, 2024
f7f8d00
Added gradle task for versioning and edited workflows (#1986)
krossgg Sep 20, 2024
8fa74ac
Update publishing.gradle (#1996)
krossgg Sep 22, 2024
db59862
Fixed Publishing Workflows (#1997)
krossgg Sep 22, 2024
5ea5b99
fix MEInputHatch not showing tooltip (#1993)
EasterFG Sep 22, 2024
aa77bd7
Boiler Burnables, Chain Recipe and Crate Tags (#1998)
YoungOnionMC Sep 22, 2024
8ec4356
fixes parallel for alloy smelters (#2004)
Spicierspace153 Sep 23, 2024
4b1b5ca
Fix ME Pattern Buffer Proxies not having the hand animation when open…
Zorbatron Sep 23, 2024
4382d14
Wirecutter/wrench tool sounds (#2006)
YoungOnionMC Sep 23, 2024
cc0a771
I fix turbine (#2010)
YoungOnionMC Sep 23, 2024
dd92f60
Fix Multi smelter not overclocking (#2008)
YoungOnionMC Sep 23, 2024
2a6da5a
Optimized voltage tier lookups (#2007)
YoungOnionMC Sep 23, 2024
d0a4077
Version-dependent fixes
krossgg Sep 24, 2024
0ba37e4
spotless
krossgg Sep 24, 2024
30c7eaf
Wood Recipes and Boats (#1980)
YoungOnionMC Sep 19, 2024
879c6f8
port #1955
screret Sep 24, 2024
7a9ad02
TODO
screret Sep 24, 2024
df1161e
Fixed recipe condition encoding (#1992)
screret Sep 24, 2024
f5868e8
Changed recipe decoding to not return immutables (#1995)
screret Sep 24, 2024
78b1360
Wood Recipes and Boats (#1980)
screret Sep 24, 2024
3177c24
sbodles
screret Sep 24, 2024
e01121e
fix off by one in oc finding (#2019)
YoungOnionMC Sep 24, 2024
ba381a6
Fix standard OC modifier for EUt outputs (#2023)
krossgg Sep 24, 2024
59b7d35
Release Notes and workflow change
krossgg Sep 24, 2024
2f87b74
Cherry-pick 1.4.4 and prepare for publish
krossgg Sep 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .github/workflows/auto-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
build:
runs-on: ubuntu-latest
env:
MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
MAVEN_USER: ${{ secrets.MAVEN_USER }}
SNAPSHOT: true
permissions:
Expand All @@ -35,11 +35,10 @@ jobs:
- name: Get Version
id: var
run: |
MESSAGE=$(ls build/libs/* | grep sources.jar -v | grep slim.jar -v | awk -F 'gtceu-|-SNAPSHOT.jar' '{print $2}')
mv "build/libs/gtceu-$MESSAGE-SNAPSHOT.jar" "build/libs/gtceu-$MESSAGE-build_${{ github.run_number }}-SNAPSHOT.jar"
mv "build/libs/gtceu-$MESSAGE-SNAPSHOT-slim.jar" "build/libs/gtceu-$MESSAGE-build_${{ github.run_number }}-SNAPSHOT-slim.jar"
mv "build/libs/gtceu-$MESSAGE-SNAPSHOT-dev-shadow.jar" "build/libs/gtceu-$MESSAGE-build_${{ github.run_number }}-SNAPSHOT-dev-shadow.jar"
echo "version=$MESSAGE-build_${{ github.run_number }}" >> $GITHUB_OUTPUT
VER=$(./gradlew -q printVersion)
BUILD_VER=$VER-build_${{ github.run_number }}
for jar in ./build/libs/*; do mv "$jar" "${jar/${VER}-SNAPSHOT/${BUILD_VER}-SNAPSHOT}";done 2>/dev/null
echo "version=$BUILD_VER" >> $GITHUB_OUTPUT

- name: Release
id: release
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/auto-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
build:
runs-on: ubuntu-latest
env:
MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
MAVEN_USER: ${{ secrets.MAVEN_USER }}
permissions:
contents: write
Expand All @@ -49,9 +49,7 @@ jobs:
- if: ${{ inputs.publishCurseForgeAndModrinth }}
name: Get Version
id: var
run: |
MESSAGE=$(ls build/libs/* | grep sources.jar -v | grep shadow.jar -v | grep slim.jar -v | awk -F 'gtceu-|.jar' '{print $2}')
echo version=$MESSAGE >> $GITHUB_OUTPUT
run: echo "version=$(./gradlew -q printVersion)" >> $GITHUB_OUTPUT

- if: ${{ inputs.publishCurseForgeAndModrinth }}
name: mc-publish-forge
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
build:
runs-on: ubuntu-latest
env:
MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
MAVEN_USER: ${{ secrets.MAVEN_USER }}
permissions:
contents: write
Expand Down
6 changes: 4 additions & 2 deletions gradle/scripts/publishing.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ publishing {
mavenJava(MavenPublication) {
groupId = project.maven_group
artifactId = project.archivesBaseName
version = project.mod_version
version = project.version

from components.java

artifact sourcesJar
}
}

Expand All @@ -22,7 +24,7 @@ publishing {
url "https://maven.firstdarkdev.xyz/snapshots"
credentials {
username System.getenv("MAVEN_USER")
password System.getenv("MAVEN_PASS")
password System.getenv("MAVEN_PASSWORD")
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions gradle/scripts/resources.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ def mod_url = getConfig("mod_url")
def mod_issue_tracker = getConfig("mod_issue_tracker")
def loader_version = getConfig("loader_version")

task printVersion {
doLast {
println libs.versions.minecraft.get() + "-" + mod_version
}
}

// This block of code expands all declared replace properties in the specified resource targets.
// A missing property will result in an error. Properties are expanded using ${} Groovy notation.
var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 7 additions & 5 deletions src/generated/resources/assets/gtceu/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -1813,7 +1813,6 @@
"compass.node.gtceu.covers/computer_monitor_cover": "ɹǝʌoƆ ɹoʇıuoW ɹǝʇndɯoƆ",
"compass.node.gtceu.covers/conveyor": "ɹoʎǝʌuoƆ",
"compass.node.gtceu.covers/cover": "¿ɹǝʌoƆ sı ʇɐɥM",
"compass.node.gtceu.covers/crafting_table_cover": "ɹǝʌoƆ ǝןqɐ⟘ buıʇɟɐɹƆ",
"compass.node.gtceu.covers/ender_fluid_link_cover": "ɹǝʌoƆ ʞuıꞀ pınןℲ ɹǝpuƎ",
"compass.node.gtceu.covers/energy_detector_cover": "ɹǝʌoƆ ɹoʇɔǝʇǝᗡ ʎbɹǝuƎ",
"compass.node.gtceu.covers/facade_cover": "ɹǝʌoƆ ǝpɐɔɐℲ",
Expand Down Expand Up @@ -2585,6 +2584,8 @@
"enchantment.gtceu.disjunction.desc": "˙sqoɯ pǝʇɐןǝɹ-ɹǝpuƎ oʇ ssǝuʍoןS puɐ ssǝuʞɐǝM sǝıןddⱯ",
"enchantment.gtceu.hard_hammer.desc": "˙ɹǝɯɯɐH ɥɔǝ⟘bǝɹ⅁ ɐ ɥʇıʍ pǝuıɯ ǝɹǝʍ ʎǝɥʇ ɟı sɐ sʞɔoןq sʞɐǝɹᗺ",
"enchantment.hard_hammer": "buıɹǝɯɯɐH",
"entity.gtceu.boat": "ʇɐoᗺ",
"entity.gtceu.chest_boat": "ʇɐoᗺ ʇsǝɥƆ",
"entity.gtceu.dynamite": "ǝʇıɯɐuʎᗡ",
"entity.gtceu.industrial_tnt": "⟘N⟘ ןɐıɹʇsnpuI",
"entity.gtceu.powderbarrel": "ןǝɹɹɐqɹǝpʍoԀ",
Expand Down Expand Up @@ -4108,7 +4109,6 @@
"item.gtceu.cpu_chip.tooltip": "ʇıu∩ buıssǝɔoɹԀ ןɐɹʇuǝƆㄥ§",
"item.gtceu.cpu_wafer": "ɹǝɟɐM ∩ԀƆ",
"item.gtceu.cpu_wafer.tooltip": "ʇıu∩ buıssǝɔoɹԀ ʍɐᴚㄥ§",
"item.gtceu.crafting_table_cover": "ɹǝʌoƆ ǝןqɐ⟘ buıʇɟɐɹƆ",
"item.gtceu.crafting_table_cover.tooltip": "˙ㄥ§ɹǝʌoƆɟ§ sɐ ǝuıɥɔɐW ɐ uo ㄥ§ɥɔuǝqʞɹoM pǝɔuɐʌpⱯɟ§",
"item.gtceu.credit_casting_mold": ")ǝbɐuıoƆ( pןoW buıʇsɐƆ",
"item.gtceu.credit_casting_mold.tooltip": ")¡ʇı ǝsoן ʇ,uoᗡ( suıoƆ buıʞɐɯ ɹoɟ pןoW ǝɹnɔǝSㄥ§",
Expand Down Expand Up @@ -4145,7 +4145,6 @@
"item.gtceu.data_stick": "ʞɔıʇS ɐʇɐᗡ",
"item.gtceu.data_stick.tooltip": "ǝbɐɹoʇS ɐʇɐᗡ ʎʇıɔɐdɐƆ ʍoꞀ Ɐㄥ§",
"item.gtceu.diamond_grinding_head": "pɐǝH buıpuıɹ⅁ puoɯɐıᗡ",
"item.gtceu.digital_interface_cover": "ǝɔɐɟɹǝʇuI ןɐʇıbıᗡ",
"item.gtceu.diode": "ǝpoıᗡ",
"item.gtceu.diode.tooltip": "ʇuǝuodɯoƆ ɔıuoɹʇɔǝןƎ ɔısɐᗺㄥ§",
"item.gtceu.doge_coin": "uıoƆ ǝboᗡ",
Expand Down Expand Up @@ -4654,6 +4653,8 @@
"item.gtceu.rotor_casting_mold.tooltip": "sɹoʇoᴚ buıʞɐɯ ɹoɟ pןoWㄥ§",
"item.gtceu.rotor_extruder_mold": ")ɹoʇoᴚ( pןoW ɹǝpnɹʇxƎ",
"item.gtceu.rotor_extruder_mold.tooltip": "sɹoʇoᴚ buıʞɐɯ ɹoɟ ǝdɐɥS ɹǝpnɹʇxƎㄥ§",
"item.gtceu.rubber_boat": "ʇɐoᗺ ɹǝqqnᴚ",
"item.gtceu.rubber_chest_boat": "ʇsǝɥƆ ɥʇıʍ ʇɐoᗺ ɹǝqqnᴚ",
"item.gtceu.rubber_gloves": "sǝʌoן⅁ ɹǝqqnᴚ",
"item.gtceu.salt_dust": "ʇןɐS",
"item.gtceu.saw_extruder_mold.tooltip": "sʍɐS buıʞɐɯ ɹoɟ ǝdɐɥS ɹǝpnɹʇxƎㄥ§",
Expand Down Expand Up @@ -4866,7 +4867,9 @@
"item.gtceu.tool.wrench.tooltip": "sǝuıɥɔɐW ǝןʇuɐɯsıp oʇ ʞɔıןɔ ʇɟǝן pןoH8§",
"item.gtceu.transistor": "ɹoʇsısuɐɹ⟘",
"item.gtceu.transistor.tooltip": "ʇuǝuodɯoƆ ɔıuoɹʇɔǝןƎ ɔısɐᗺㄥ§",
"item.gtceu.treated_wood_boat": "ʇɐoᗺ pooM pǝʇɐǝɹ⟘",
"item.gtceu.treated_wood_bolt": "ʞɔıʇS pooM pǝʇɐǝɹ⟘ ʇɹoɥS",
"item.gtceu.treated_wood_chest_boat": "ʇsǝɥƆ ɥʇıʍ ʇɐoᗺ pooM pǝʇɐǝɹ⟘",
"item.gtceu.treated_wood_dust": "dןnԀ pooM pǝʇɐǝɹ⟘",
"item.gtceu.treated_wood_plate": "ʞuɐןԀ pooM pǝʇɐǝɹ⟘",
"item.gtceu.treated_wood_rod": "ʞɔıʇS pooM pǝʇɐǝɹ⟘",
Expand Down Expand Up @@ -4966,7 +4969,6 @@
"item.gtceu.white_dye_spray_can": ")ǝʇıɥM( uɐƆ ʎɐɹdS",
"item.gtceu.wire_extruder_mold": ")ǝɹıM( pןoW ɹǝpnɹʇxƎ",
"item.gtceu.wire_extruder_mold.tooltip": "sǝɹıM buıʞɐɯ ɹoɟ ǝdɐɥS ɹǝpnɹʇxƎㄥ§",
"item.gtceu.wireless_digital_interface_cover": "ǝɔɐɟɹǝʇuI ןɐʇıbıᗡ ssǝןǝɹıM",
"item.gtceu.wood_bolt": "ʞɔıʇS pooM ʇɹoɥS",
"item.gtceu.wood_dust": "dןnԀ pooM",
"item.gtceu.wood_plate": "ʞuɐןԀ pooM",
Expand Down Expand Up @@ -5173,7 +5175,7 @@
"material.gtceu.dubnium": "ɯnıuqnᗡ",
"material.gtceu.duranium": "ɯnıuɐɹnᗡ",
"material.gtceu.dysprosium": "ɯnısoɹdsʎᗡ",
"material.gtceu.echo": "oɥɔƎ",
"material.gtceu.echo_shard": "pɹɐɥS oɥɔƎ",
"material.gtceu.einsteinium": "ɯnıuıǝʇsuıƎ",
"material.gtceu.electrotine": "ǝuıʇoɹʇɔǝןƎ",
"material.gtceu.electrum": "ɯnɹʇɔǝןƎ",
Expand Down
12 changes: 7 additions & 5 deletions src/generated/resources/assets/gtceu/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -1813,7 +1813,6 @@
"compass.node.gtceu.covers/computer_monitor_cover": "Computer Monitor Cover",
"compass.node.gtceu.covers/conveyor": "Conveyor",
"compass.node.gtceu.covers/cover": "What is Cover?",
"compass.node.gtceu.covers/crafting_table_cover": "Crafting Table Cover",
"compass.node.gtceu.covers/ender_fluid_link_cover": "Ender Fluid Link Cover",
"compass.node.gtceu.covers/energy_detector_cover": "Energy Detector Cover",
"compass.node.gtceu.covers/facade_cover": "Facade Cover",
Expand Down Expand Up @@ -2585,6 +2584,8 @@
"enchantment.gtceu.disjunction.desc": "Applies Weakness and Slowness to Ender-related mobs.",
"enchantment.gtceu.hard_hammer.desc": "Breaks blocks as if they were mined with a GregTech Hammer.",
"enchantment.hard_hammer": "Hammering",
"entity.gtceu.boat": "Boat",
"entity.gtceu.chest_boat": "Chest Boat",
"entity.gtceu.dynamite": "Dynamite",
"entity.gtceu.industrial_tnt": "Industrial TNT",
"entity.gtceu.powderbarrel": "Powderbarrel",
Expand Down Expand Up @@ -4108,7 +4109,6 @@
"item.gtceu.cpu_chip.tooltip": "§7Central Processing Unit",
"item.gtceu.cpu_wafer": "CPU Wafer",
"item.gtceu.cpu_wafer.tooltip": "§7Raw Processing Unit",
"item.gtceu.crafting_table_cover": "Crafting Table Cover",
"item.gtceu.crafting_table_cover.tooltip": "§fAdvanced Workbench§7 on a Machine as §fCover§7.",
"item.gtceu.credit_casting_mold": "Casting Mold (Coinage)",
"item.gtceu.credit_casting_mold.tooltip": "§7Secure Mold for making Coins (Don't lose it!)",
Expand Down Expand Up @@ -4145,7 +4145,6 @@
"item.gtceu.data_stick": "Data Stick",
"item.gtceu.data_stick.tooltip": "§7A Low Capacity Data Storage",
"item.gtceu.diamond_grinding_head": "Diamond Grinding Head",
"item.gtceu.digital_interface_cover": "Digital Interface",
"item.gtceu.diode": "Diode",
"item.gtceu.diode.tooltip": "§7Basic Electronic Component",
"item.gtceu.doge_coin": "Doge Coin",
Expand Down Expand Up @@ -4654,6 +4653,8 @@
"item.gtceu.rotor_casting_mold.tooltip": "§7Mold for making Rotors",
"item.gtceu.rotor_extruder_mold": "Extruder Mold (Rotor)",
"item.gtceu.rotor_extruder_mold.tooltip": "§7Extruder Shape for making Rotors",
"item.gtceu.rubber_boat": "Rubber Boat",
"item.gtceu.rubber_chest_boat": "Rubber Boat with Chest",
"item.gtceu.rubber_gloves": "Rubber Gloves",
"item.gtceu.salt_dust": "Salt",
"item.gtceu.saw_extruder_mold.tooltip": "§7Extruder Shape for making Saws",
Expand Down Expand Up @@ -4866,7 +4867,9 @@
"item.gtceu.tool.wrench.tooltip": "§8Hold left click to dismantle Machines",
"item.gtceu.transistor": "Transistor",
"item.gtceu.transistor.tooltip": "§7Basic Electronic Component",
"item.gtceu.treated_wood_boat": "Treated Wood Boat",
"item.gtceu.treated_wood_bolt": "Short Treated Wood Stick",
"item.gtceu.treated_wood_chest_boat": "Treated Wood Boat with Chest",
"item.gtceu.treated_wood_dust": "Treated Wood Pulp",
"item.gtceu.treated_wood_plate": "Treated Wood Plank",
"item.gtceu.treated_wood_rod": "Treated Wood Stick",
Expand Down Expand Up @@ -4966,7 +4969,6 @@
"item.gtceu.white_dye_spray_can": "Spray Can (White)",
"item.gtceu.wire_extruder_mold": "Extruder Mold (Wire)",
"item.gtceu.wire_extruder_mold.tooltip": "§7Extruder Shape for making Wires",
"item.gtceu.wireless_digital_interface_cover": "Wireless Digital Interface",
"item.gtceu.wood_bolt": "Short Wood Stick",
"item.gtceu.wood_dust": "Wood Pulp",
"item.gtceu.wood_plate": "Wood Plank",
Expand Down Expand Up @@ -5173,7 +5175,7 @@
"material.gtceu.dubnium": "Dubnium",
"material.gtceu.duranium": "Duranium",
"material.gtceu.dysprosium": "Dysprosium",
"material.gtceu.echo": "Echo",
"material.gtceu.echo_shard": "Echo Shard",
"material.gtceu.einsteinium": "Einsteinium",
"material.gtceu.electrotine": "Electrotine",
"material.gtceu.electrum": "Electrum",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/empty_tier_i/top",
"side": "gtceu:block/casings/battery/empty_tier_i/top",
"top": "gtceu:block/casings/battery/empty_tier_i/side"
"side": "gtceu:block/casings/battery/empty_tier_i/side",
"top": "gtceu:block/casings/battery/empty_tier_i/top"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/empty_tier_ii/top",
"side": "gtceu:block/casings/battery/empty_tier_ii/top",
"top": "gtceu:block/casings/battery/empty_tier_ii/side"
"side": "gtceu:block/casings/battery/empty_tier_ii/side",
"top": "gtceu:block/casings/battery/empty_tier_ii/top"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/empty_tier_iii/top",
"side": "gtceu:block/casings/battery/empty_tier_iii/top",
"top": "gtceu:block/casings/battery/empty_tier_iii/side"
"side": "gtceu:block/casings/battery/empty_tier_iii/side",
"top": "gtceu:block/casings/battery/empty_tier_iii/top"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/ev_lapotronic/top",
"side": "gtceu:block/casings/battery/ev_lapotronic/top",
"top": "gtceu:block/casings/battery/ev_lapotronic/side"
"side": "gtceu:block/casings/battery/ev_lapotronic/side",
"top": "gtceu:block/casings/battery/ev_lapotronic/top"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "minecraft:block/tnt_bottom",
"side": "gtceu:block/industrial_tnt_side",
"side": "gtceu:block/misc/industrial_tnt_side",
"top": "minecraft:block/tnt_top"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/iv_lapotronic/top",
"side": "gtceu:block/casings/battery/iv_lapotronic/top",
"top": "gtceu:block/casings/battery/iv_lapotronic/side"
"side": "gtceu:block/casings/battery/iv_lapotronic/side",
"top": "gtceu:block/casings/battery/iv_lapotronic/top"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/luv_lapotronic/top",
"side": "gtceu:block/casings/battery/luv_lapotronic/top",
"top": "gtceu:block/casings/battery/luv_lapotronic/side"
"side": "gtceu:block/casings/battery/luv_lapotronic/side",
"top": "gtceu:block/casings/battery/luv_lapotronic/top"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/uhv_ultimate/top",
"side": "gtceu:block/casings/battery/uhv_ultimate/top",
"top": "gtceu:block/casings/battery/uhv_ultimate/side"
"side": "gtceu:block/casings/battery/uhv_ultimate/side",
"top": "gtceu:block/casings/battery/uhv_ultimate/top"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/uv_lapotronic/top",
"side": "gtceu:block/casings/battery/uv_lapotronic/top",
"top": "gtceu:block/casings/battery/uv_lapotronic/side"
"side": "gtceu:block/casings/battery/uv_lapotronic/side",
"top": "gtceu:block/casings/battery/uv_lapotronic/top"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/zpm_lapotronic/top",
"side": "gtceu:block/casings/battery/zpm_lapotronic/top",
"top": "gtceu:block/casings/battery/zpm_lapotronic/side"
"side": "gtceu:block/casings/battery/zpm_lapotronic/side",
"top": "gtceu:block/casings/battery/zpm_lapotronic/top"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "gtceu:item/crafting_table_cover"
"layer0": "gtceu:item/rubber_boat"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "gtceu:item/digital_interface_cover"
"layer0": "gtceu:item/rubber_chest_boat"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "gtceu:item/wireless_digital_interface_cover"
"layer0": "gtceu:item/treated_wood_boat"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "gtceu:item/treated_wood_chest_boat"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"values": [
"gtceu:rubber_log"
"gtceu:rubber_log",
"gtceu:stripped_rubber_log",
"gtceu:rubber_wood",
"gtceu:stripped_rubber_wood"
]
}
}
Loading