Skip to content

Commit e62003c

Browse files
authored
Fix missing/invalid pipe model issues (#4530)
1 parent 7b7ac44 commit e62003c

19 files changed

Lines changed: 736 additions & 117 deletions

File tree

src/generated/resources/assets/gtceu/lang/en_ud.json

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
"behaviour.lighter.uses": "%d :sǝsn buıuıɐɯǝᴚ",
6767
"behaviour.memory_card.client_msg.cleared": "pǝɹɐǝןɔ uoıʇɐɹnbıɟuoɔ pǝɹoʇS",
6868
"behaviour.memory_card.client_msg.copied": "uoıʇɐɹnbıɟuoɔ ǝuıɥɔɐɯ pǝıdoƆ",
69+
"behaviour.memory_card.client_msg.missing_items": "uoıʇɐɹnbıɟuoɔ ǝʇsɐd oʇ pǝɹınbǝɹ sɯǝʇı buıssıW",
6970
"behaviour.memory_card.client_msg.pasted": "uoıʇɐɹnbıɟuoɔ ǝuıɥɔɐɯ pǝıןddⱯ",
7071
"behaviour.memory_card.copy_target": "%s :buıʎdoƆ",
7172
"behaviour.memory_card.disabled": "ɹ§pǝןqɐsıᗡɔ§",
@@ -1745,6 +1746,7 @@
17451746
"config.gtceu.option.addLoot": "ʇooꞀppɐ",
17461747
"config.gtceu.option.ae2": "ᄅǝɐ",
17471748
"config.gtceu.option.allowDrumsInputFluidsFromOutputSide": "ǝpıSʇndʇnOɯoɹℲspınןℲʇnduIsɯnɹᗡʍoןןɐ",
1749+
"config.gtceu.option.allowedImageDomains": "suıɐɯoᗡǝbɐɯIpǝʍoןןɐ",
17481750
"config.gtceu.option.animationTime": "ǝɯı⟘uoıʇɐɯıuɐ",
17491751
"config.gtceu.option.arcRecyclingYield": "pןǝıʎbuıןɔʎɔǝᴚɔɹɐ",
17501752
"config.gtceu.option.armorHud": "pnHɹoɯɹɐ",
@@ -1892,7 +1894,7 @@
18921894
"config.gtceu.option.steelSteamMultiblocks": "sʞɔoןqıʇןnWɯɐǝʇSןǝǝʇs",
18931895
"config.gtceu.option.surfaceRockProspectRange": "ǝbuɐᴚʇɔǝdsoɹԀʞɔoᴚǝɔɐɟɹns",
18941896
"config.gtceu.option.tankItemFluidPreview": "ʍǝıʌǝɹԀpınןℲɯǝʇIʞuɐʇ",
1895-
"config.gtceu.option.temperaturesInKelvin": "uıʌןǝʞuIsǝɹnʇɐɹǝdɯǝʇ",
1897+
"config.gtceu.option.temperaturesInCelsius": "snısןǝƆuIsǝɹnʇɐɹǝdɯǝʇ",
18961898
"config.gtceu.option.titaniumBoilerHeatSpeed": "pǝǝdSʇɐǝHɹǝןıoᗺɯnıuɐʇıʇ",
18971899
"config.gtceu.option.titaniumBoilerMaxTemperature": "ǝɹnʇɐɹǝdɯǝ⟘xɐWɹǝןıoᗺɯnıuɐʇıʇ",
18981900
"config.gtceu.option.toggle": "ǝןbboʇ",
@@ -2616,6 +2618,7 @@
26162618
"gtceu.key.armor_mode_switch": "ɥɔʇıʍS ǝpoW ɹoɯɹⱯ",
26172619
"gtceu.key.enable_boots": "dɯnſ pǝʇsooᗺ ǝןqɐuƎ",
26182620
"gtceu.key.enable_jetpack": "ʞɔɐdʇǝſ ǝןqɐuƎ",
2621+
"gtceu.key.enable_step_assist": "ʇsıssⱯdǝʇS ǝןqɐuƎ",
26192622
"gtceu.key.tool_aoe_change": "ɥɔʇıʍS ǝpoW ƎoⱯ ןoo⟘",
26202623
"gtceu.large_boiler": "ɹǝןıoᗺ ǝbɹɐꞀ",
26212624
"gtceu.large_chemical_reactor": "ɹoʇɔɐǝᴚ ןɐɔıɯǝɥƆ ǝbɹɐꞀ",
@@ -4733,7 +4736,7 @@
47334736
"item.gtceu.talc_dust": "ɔןɐ⟘",
47344737
"item.gtceu.tantalum_capacitor": "ɹoʇıɔɐdɐƆ ɯnןɐʇuɐ⟘",
47354738
"item.gtceu.terminal": "ןɐuıɯɹǝ⟘",
4736-
"item.gtceu.terminal.tooltip": "ʞɔoןq-ıʇןnɯ ǝɥʇ pןınq ʎןןɐɔıʇɐɯoʇnɐ oʇ ɹǝןןoɹʇuoɔ ɐ uo ʞɔıןƆ-ᴚ + ʇɟıɥS",
4739+
"item.gtceu.terminal.tooltip": "ʎɹoʇuǝʌuı ɹnoʎ ɯoɹɟ sɯǝʇı ɥʇıʍ ʞɔoןqıʇןnɯ ɐ pןınq ʎןןɐɔıʇɐɯoʇnɐ oʇ ɹǝןןoɹʇuoɔ ɐ uo ʞɔıןƆ-ᴚ + ʇɟıɥS",
47374740
"item.gtceu.text_module": "ǝןnpoW ʇxǝ⟘",
47384741
"item.gtceu.tiny_ash_dust": "sǝɥsⱯ ɟo ǝןıԀ ʎuı⟘",
47394742
"item.gtceu.tiny_basaltic_mineral_sand_dust": "puɐS ןɐɹǝuıW ɔıʇןɐsɐᗺ ɟo ǝןıԀ ʎuı⟘",
@@ -4836,7 +4839,7 @@
48364839
"item.gtceu.tool.lv_screwdriver.tooltip": "sǝuıɥɔɐW puɐ sɹǝʌoƆ sʇsnظpⱯ8§",
48374840
"item.gtceu.tool.lv_wirecutter": ")ΛꞀ( ɹǝʇʇnƆ ǝɹıM %s",
48384841
"item.gtceu.tool.lv_wrench": ")ΛꞀ( ɥɔuǝɹM %s",
4839-
"item.gtceu.tool.lv_wrench.tooltip": "sǝuıɥɔɐW ǝןʇuɐɯsıp oʇs ʞɔıןɔ ʇɟǝן pןoH8§",
4842+
"item.gtceu.tool.lv_wrench.tooltip": "sǝuıɥɔɐW ǝןʇuɐɯsıp ʞɔıןɔ ʇɟǝן pןoH8§",
48404843
"item.gtceu.tool.mallet": "ʇǝןןɐW ʇɟoS %s",
48414844
"item.gtceu.tool.mallet.tooltip.0": "˙ǝdıɔǝᴚ ʇuǝɹɹnƆ ɹǝʇɟⱯ ǝuıɥɔɐW ǝsnɐԀ oʇ ʞɐǝuS8§",
48424845
"item.gtceu.tool.mallet.tooltip.1": "sǝuıɥɔɐW sʇɹɐʇS/sdoʇS8§",
@@ -5698,20 +5701,24 @@
56985701
"metaarmor.message.nightvision.disabled": "ɟɟOɔ§ :uoısıΛʇɥbıNq§",
56995702
"metaarmor.message.nightvision.enabled": "uOɐ§ :uoısıΛʇɥbıNq§",
57005703
"metaarmor.message.nightvision.error": "¡ɹǝʍod ɥbnouǝ ʇoNɔ§",
5701-
"metaarmor.nms.boosted_jump.disabled": "pǝןqɐsıᗡ ʇsooᗺ dɯnſ :ǝʇınS ™ǝןɔsnWouɐN",
5702-
"metaarmor.nms.boosted_jump.enabled": "pǝןqɐuƎ ʇsooᗺ dɯnſ :ǝʇınS ™ǝןɔsnWouɐN",
57035704
"metaarmor.nms.nightvision.disabled": "pǝןqɐsıᗡ uoısıΛʇɥbıN :ǝʇınS ™ǝןɔsnWouɐN",
57045705
"metaarmor.nms.nightvision.enabled": "pǝןqɐuƎ uoısıΛʇɥbıN :ǝʇınS ™ǝןɔsnWouɐN",
57055706
"metaarmor.nms.nightvision.error": "¡ɹǝʍod ɥbnouǝ ʇoNɔ§ :ǝʇınS ™ǝןɔsnWouɐN",
57065707
"metaarmor.nms.share.disable": "pǝןqɐsıᗡ buıbɹɐɥƆ :ǝʇınS ™ǝןɔsnWouɐN",
57075708
"metaarmor.nms.share.enable": "pǝןqɐuƎ buıbɹɐɥƆ :ǝʇınS ™ǝןɔsnWouɐN",
57085709
"metaarmor.nms.share.error": "¡buıbɹɐɥɔ ɹoɟ ɹǝʍod ɥbnouǝ ʇoNɔ§ :ǝʇınS ™ǝןɔsnWouɐN",
5710+
"metaarmor.nms.step_assist.disabled": "pǝןqɐsıᗡ ʇsıssⱯdǝʇS :ǝʇınS ™ǝןɔsnWouɐN",
5711+
"metaarmor.nms.step_assist.enabled": "pǝןqɐuƎ ʇsıssⱯdǝʇS :ǝʇınS ™ǝןɔsnWouɐN",
5712+
"metaarmor.qts.boosted_jump.disabled": "pǝןqɐsıᗡ ʇsooᗺ dɯnſ :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
5713+
"metaarmor.qts.boosted_jump.enabled": "pǝןqɐuƎ ʇsooᗺ dɯnſ :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
57095714
"metaarmor.qts.nightvision.disabled": "pǝןqɐsıᗡ uoısıΛʇɥbıN :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
57105715
"metaarmor.qts.nightvision.enabled": "pǝןqɐuƎ uoısıΛʇɥbıN :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
57115716
"metaarmor.qts.nightvision.error": "¡ɹǝʍod ɥbnouǝ ʇoNɔ§ :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
57125717
"metaarmor.qts.share.disable": "pǝןqɐsıᗡ buıbɹɐɥƆ :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
57135718
"metaarmor.qts.share.enable": "pǝןqɐuƎ buıbɹɐɥƆ :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
57145719
"metaarmor.qts.share.error": "¡buıbɹɐɥɔ ɹoɟ ɹǝʍod ɥbnouǝ ʇoNɔ§ :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
5720+
"metaarmor.qts.step_assist.disabled": "pǝןqɐsıᗡ ʇsıssⱯdǝʇS :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
5721+
"metaarmor.qts.step_assist.enabled": "pǝןqɐuƎ ʇsıssⱯdǝʇS :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
57155722
"metaarmor.tooltip.autoeat": "ʎɹoʇuǝʌuI ɯoɹɟ pooℲ buıs∩ ʎq ɹɐᗺ pooℲ sǝɥsıuǝןdǝᴚ",
57165723
"metaarmor.tooltip.breath": "ɹɐᗺ ɥʇɐǝɹᗺ ɹǝʇɐʍɹǝpu∩ sǝɥsıuǝןdǝᴚ",
57175724
"metaarmor.tooltip.burning": "buıuɹnᗺ sǝıɟıןןnN",

src/generated/resources/assets/gtceu/lang/en_us.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
"behaviour.lighter.uses": "Remaining uses: %d",
6767
"behaviour.memory_card.client_msg.cleared": "Stored configuration cleared",
6868
"behaviour.memory_card.client_msg.copied": "Copied machine configuration",
69+
"behaviour.memory_card.client_msg.missing_items": "Missing items required to paste configuration",
6970
"behaviour.memory_card.client_msg.pasted": "Applied machine configuration",
7071
"behaviour.memory_card.copy_target": "Copying: %s",
7172
"behaviour.memory_card.disabled": "§cDisabled§r",
@@ -1745,6 +1746,7 @@
17451746
"config.gtceu.option.addLoot": "addLoot",
17461747
"config.gtceu.option.ae2": "ae2",
17471748
"config.gtceu.option.allowDrumsInputFluidsFromOutputSide": "allowDrumsInputFluidsFromOutputSide",
1749+
"config.gtceu.option.allowedImageDomains": "allowedImageDomains",
17481750
"config.gtceu.option.animationTime": "animationTime",
17491751
"config.gtceu.option.arcRecyclingYield": "arcRecyclingYield",
17501752
"config.gtceu.option.armorHud": "armorHud",
@@ -1892,7 +1894,7 @@
18921894
"config.gtceu.option.steelSteamMultiblocks": "steelSteamMultiblocks",
18931895
"config.gtceu.option.surfaceRockProspectRange": "surfaceRockProspectRange",
18941896
"config.gtceu.option.tankItemFluidPreview": "tankItemFluidPreview",
1895-
"config.gtceu.option.temperaturesInKelvin": "temperaturesInKelvin",
1897+
"config.gtceu.option.temperaturesInCelsius": "temperaturesInCelsius",
18961898
"config.gtceu.option.titaniumBoilerHeatSpeed": "titaniumBoilerHeatSpeed",
18971899
"config.gtceu.option.titaniumBoilerMaxTemperature": "titaniumBoilerMaxTemperature",
18981900
"config.gtceu.option.toggle": "toggle",
@@ -2616,8 +2618,8 @@
26162618
"gtceu.key.armor_mode_switch": "Armor Mode Switch",
26172619
"gtceu.key.enable_boots": "Enable Boosted Jump",
26182620
"gtceu.key.enable_jetpack": "Enable Jetpack",
2619-
"gtceu.key.tool_aoe_change": "Tool AoE Mode Switch",
26202621
"gtceu.key.enable_step_assist": "Enable StepAssist",
2622+
"gtceu.key.tool_aoe_change": "Tool AoE Mode Switch",
26212623
"gtceu.large_boiler": "Large Boiler",
26222624
"gtceu.large_chemical_reactor": "Large Chemical Reactor",
26232625
"gtceu.laser_engraver": "Laser Engraver",
@@ -4734,7 +4736,7 @@
47344736
"item.gtceu.talc_dust": "Talc",
47354737
"item.gtceu.tantalum_capacitor": "Tantalum Capacitor",
47364738
"item.gtceu.terminal": "Terminal",
4737-
"item.gtceu.terminal.tooltip": "Shift + R-Click on a controller to automatically build the multi-block",
4739+
"item.gtceu.terminal.tooltip": "Shift + R-Click on a controller to automatically build a multiblock with items from your inventory",
47384740
"item.gtceu.text_module": "Text Module",
47394741
"item.gtceu.tiny_ash_dust": "Tiny Pile of Ashes",
47404742
"item.gtceu.tiny_basaltic_mineral_sand_dust": "Tiny Pile of Basaltic Mineral Sand",
@@ -5699,26 +5701,24 @@
56995701
"metaarmor.message.nightvision.disabled": "§bNightVision: §cOff",
57005702
"metaarmor.message.nightvision.enabled": "§bNightVision: §aOn",
57015703
"metaarmor.message.nightvision.error": "§cNot enough power!",
5702-
"metaarmor.message.step_assist.disabled": "StepAssist: §cOff",
5703-
"metaarmor.message.step_assist.enabled": "StepAssist: §aOn",
57045704
"metaarmor.nms.nightvision.disabled": "NanoMuscle™ Suite: NightVision Disabled",
57055705
"metaarmor.nms.nightvision.enabled": "NanoMuscle™ Suite: NightVision Enabled",
57065706
"metaarmor.nms.nightvision.error": "NanoMuscle™ Suite: §cNot enough power!",
5707-
"metaarmor.qts.nightvision.disabled": "QuarkTech™ Suite: NightVision Disabled",
5708-
"metaarmor.qts.nightvision.enabled": "QuarkTech™ Suite: NightVision Enabled",
5709-
"metaarmor.qts.nightvision.error": "QuarkTech™ Suite: §cNot enough power!",
5710-
"metaarmor.nms.step_assist.disabled": "NanoMuscle™ Suite: StepAssist Disabled",
5711-
"metaarmor.nms.step_assist.enabled": "NanoMuscle™ Suite: StepAssist Enabled",
5712-
"metaarmor.qts.step_assist.disabled": "QuarkTech™ Suite: StepAssist Disabled",
5713-
"metaarmor.qts.step_assist.enabled": "QuarkTech™ Suite: StepAssist Enabled",
57145707
"metaarmor.nms.share.disable": "NanoMuscle™ Suite: Charging Disabled",
57155708
"metaarmor.nms.share.enable": "NanoMuscle™ Suite: Charging Enabled",
57165709
"metaarmor.nms.share.error": "NanoMuscle™ Suite: §cNot enough power for charging!",
5710+
"metaarmor.nms.step_assist.disabled": "NanoMuscle™ Suite: StepAssist Disabled",
5711+
"metaarmor.nms.step_assist.enabled": "NanoMuscle™ Suite: StepAssist Enabled",
5712+
"metaarmor.qts.boosted_jump.disabled": "QuarkTech™ Suite: Jump Boost Disabled",
5713+
"metaarmor.qts.boosted_jump.enabled": "QuarkTech™ Suite: Jump Boost Enabled",
5714+
"metaarmor.qts.nightvision.disabled": "QuarkTech™ Suite: NightVision Disabled",
5715+
"metaarmor.qts.nightvision.enabled": "QuarkTech™ Suite: NightVision Enabled",
5716+
"metaarmor.qts.nightvision.error": "QuarkTech™ Suite: §cNot enough power!",
57175717
"metaarmor.qts.share.disable": "QuarkTech™ Suite: Charging Disabled",
57185718
"metaarmor.qts.share.enable": "QuarkTech™ Suite: Charging Enabled",
57195719
"metaarmor.qts.share.error": "QuarkTech™ Suite: §cNot enough power for charging!",
5720-
"metaarmor.qts.boosted_jump.disabled": "QuarkTech™ Suite: Jump Boost Disabled",
5721-
"metaarmor.qts.boosted_jump.enabled": "QuarkTech™ Suite: Jump Boost Enabled",
5720+
"metaarmor.qts.step_assist.disabled": "QuarkTech™ Suite: StepAssist Disabled",
5721+
"metaarmor.qts.step_assist.enabled": "QuarkTech™ Suite: StepAssist Enabled",
57225722
"metaarmor.tooltip.autoeat": "Replenishes Food Bar by Using Food from Inventory",
57235723
"metaarmor.tooltip.breath": "Replenishes Underwater Breath Bar",
57245724
"metaarmor.tooltip.burning": "Nullifies Burning",

src/generated/resources/assets/gtceu/models/block/pipe/huge_duct_pipe/center.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
}
4242
],
4343
"textures": {
44-
"end": "gtceu:block/pipe/pipe_duct_in",
4544
"side": "gtceu:block/pipe/pipe_duct_side"
4645
}
4746
}

src/generated/resources/assets/gtceu/models/block/pipe/large_duct_pipe/center.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
}
4242
],
4343
"textures": {
44-
"end": "gtceu:block/pipe/pipe_duct_in",
4544
"side": "gtceu:block/pipe/pipe_duct_side"
4645
}
4746
}

src/generated/resources/assets/gtceu/models/block/pipe/normal_duct_pipe/center.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
}
4242
],
4343
"textures": {
44-
"end": "gtceu:block/pipe/pipe_duct_in",
4544
"side": "gtceu:block/pipe/pipe_duct_side"
4645
}
4746
}

src/generated/resources/assets/gtceu/models/block/pipe/normal_laser_pipe/center.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
}
8080
],
8181
"textures": {
82-
"end": "gtceu:block/pipe/pipe_laser_in",
8382
"side": "gtceu:block/pipe/pipe_laser_side",
8483
"side_overlay": "gtceu:block/pipe/pipe_laser_side_overlay"
8584
}
Lines changed: 110 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,115 @@
11
{
2-
"parent": "gtceu:block/pipe/normal_laser_pipe/center",
2+
"parent": "minecraft:block/block",
3+
"elements": [
4+
{
5+
"faces": {
6+
"down": {
7+
"texture": "#side",
8+
"tintindex": 0
9+
},
10+
"east": {
11+
"texture": "#side",
12+
"tintindex": 0
13+
},
14+
"north": {
15+
"texture": "#side",
16+
"tintindex": 0
17+
},
18+
"south": {
19+
"texture": "#side",
20+
"tintindex": 0
21+
},
22+
"up": {
23+
"texture": "#side",
24+
"tintindex": 0
25+
},
26+
"west": {
27+
"texture": "#side",
28+
"tintindex": 0
29+
}
30+
},
31+
"from": [
32+
5,
33+
5,
34+
5
35+
],
36+
"to": [
37+
11,
38+
11,
39+
11
40+
]
41+
},
42+
{
43+
"faces": {
44+
"down": {
45+
"forge_data": {
46+
"ambient_occlusion": false,
47+
"block_light": 15,
48+
"sky_light": 15
49+
},
50+
"texture": "#side_overlay",
51+
"tintindex": 2
52+
},
53+
"east": {
54+
"forge_data": {
55+
"ambient_occlusion": false,
56+
"block_light": 15,
57+
"sky_light": 15
58+
},
59+
"texture": "#side_overlay",
60+
"tintindex": 2
61+
},
62+
"north": {
63+
"forge_data": {
64+
"ambient_occlusion": false,
65+
"block_light": 15,
66+
"sky_light": 15
67+
},
68+
"texture": "#side_overlay",
69+
"tintindex": 2
70+
},
71+
"south": {
72+
"forge_data": {
73+
"ambient_occlusion": false,
74+
"block_light": 15,
75+
"sky_light": 15
76+
},
77+
"texture": "#side_overlay",
78+
"tintindex": 2
79+
},
80+
"up": {
81+
"forge_data": {
82+
"ambient_occlusion": false,
83+
"block_light": 15,
84+
"sky_light": 15
85+
},
86+
"texture": "#side_overlay",
87+
"tintindex": 2
88+
},
89+
"west": {
90+
"forge_data": {
91+
"ambient_occlusion": false,
92+
"block_light": 15,
93+
"sky_light": 15
94+
},
95+
"texture": "#side_overlay",
96+
"tintindex": 2
97+
}
98+
},
99+
"from": [
100+
4.998,
101+
4.998,
102+
4.998
103+
],
104+
"to": [
105+
11.002,
106+
11.002,
107+
11.002
108+
]
109+
}
110+
],
3111
"textures": {
112+
"side": "gtceu:block/pipe/pipe_laser_side",
4113
"side_overlay": "gtceu:block/pipe/pipe_laser_side_overlay_emissive"
5114
}
6115
}

0 commit comments

Comments
 (0)