Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 12 additions & 5 deletions src/generated/resources/assets/gtceu/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
"behaviour.lighter.uses": "%d :sǝsn buıuıɐɯǝᴚ",
"behaviour.memory_card.client_msg.cleared": "pǝɹɐǝןɔ uoıʇɐɹnbıɟuoɔ pǝɹoʇS",
"behaviour.memory_card.client_msg.copied": "uoıʇɐɹnbıɟuoɔ ǝuıɥɔɐɯ pǝıdoƆ",
"behaviour.memory_card.client_msg.missing_items": "uoıʇɐɹnbıɟuoɔ ǝʇsɐd oʇ pǝɹınbǝɹ sɯǝʇı buıssıW",
"behaviour.memory_card.client_msg.pasted": "uoıʇɐɹnbıɟuoɔ ǝuıɥɔɐɯ pǝıןddⱯ",
"behaviour.memory_card.copy_target": "%s :buıʎdoƆ",
"behaviour.memory_card.disabled": "ɹ§pǝןqɐsıᗡɔ§",
Expand Down Expand Up @@ -1745,6 +1746,7 @@
"config.gtceu.option.addLoot": "ʇooꞀppɐ",
"config.gtceu.option.ae2": "ᄅǝɐ",
"config.gtceu.option.allowDrumsInputFluidsFromOutputSide": "ǝpıSʇndʇnOɯoɹℲspınןℲʇnduIsɯnɹᗡʍoןןɐ",
"config.gtceu.option.allowedImageDomains": "suıɐɯoᗡǝbɐɯIpǝʍoןןɐ",
"config.gtceu.option.animationTime": "ǝɯı⟘uoıʇɐɯıuɐ",
"config.gtceu.option.arcRecyclingYield": "pןǝıʎbuıןɔʎɔǝᴚɔɹɐ",
"config.gtceu.option.armorHud": "pnHɹoɯɹɐ",
Expand Down Expand Up @@ -1892,7 +1894,7 @@
"config.gtceu.option.steelSteamMultiblocks": "sʞɔoןqıʇןnWɯɐǝʇSןǝǝʇs",
"config.gtceu.option.surfaceRockProspectRange": "ǝbuɐᴚʇɔǝdsoɹԀʞɔoᴚǝɔɐɟɹns",
"config.gtceu.option.tankItemFluidPreview": "ʍǝıʌǝɹԀpınןℲɯǝʇIʞuɐʇ",
"config.gtceu.option.temperaturesInKelvin": "uıʌןǝʞuIsǝɹnʇɐɹǝdɯǝʇ",
"config.gtceu.option.temperaturesInCelsius": "snısןǝƆuIsǝɹnʇɐɹǝdɯǝʇ",
"config.gtceu.option.titaniumBoilerHeatSpeed": "pǝǝdSʇɐǝHɹǝןıoᗺɯnıuɐʇıʇ",
"config.gtceu.option.titaniumBoilerMaxTemperature": "ǝɹnʇɐɹǝdɯǝ⟘xɐWɹǝןıoᗺɯnıuɐʇıʇ",
"config.gtceu.option.toggle": "ǝןbboʇ",
Expand Down Expand Up @@ -2616,6 +2618,7 @@
"gtceu.key.armor_mode_switch": "ɥɔʇıʍS ǝpoW ɹoɯɹⱯ",
"gtceu.key.enable_boots": "dɯnſ pǝʇsooᗺ ǝןqɐuƎ",
"gtceu.key.enable_jetpack": "ʞɔɐdʇǝſ ǝןqɐuƎ",
"gtceu.key.enable_step_assist": "ʇsıssⱯdǝʇS ǝןqɐuƎ",
"gtceu.key.tool_aoe_change": "ɥɔʇıʍS ǝpoW ƎoⱯ ןoo⟘",
"gtceu.large_boiler": "ɹǝןıoᗺ ǝbɹɐꞀ",
"gtceu.large_chemical_reactor": "ɹoʇɔɐǝᴚ ןɐɔıɯǝɥƆ ǝbɹɐꞀ",
Expand Down Expand Up @@ -4733,7 +4736,7 @@
"item.gtceu.talc_dust": "ɔןɐ⟘",
"item.gtceu.tantalum_capacitor": "ɹoʇıɔɐdɐƆ ɯnןɐʇuɐ⟘",
"item.gtceu.terminal": "ןɐuıɯɹǝ⟘",
"item.gtceu.terminal.tooltip": "ʞɔoןq-ıʇןnɯ ǝɥʇ pןınq ʎןןɐɔıʇɐɯoʇnɐ oʇ ɹǝןןoɹʇuoɔ ɐ uo ʞɔıןƆ-ᴚ + ʇɟıɥS",
"item.gtceu.terminal.tooltip": "ʎɹoʇuǝʌuı ɹnoʎ ɯoɹɟ sɯǝʇı ɥʇıʍ ʞɔoןqıʇןnɯ ɐ pןınq ʎןןɐɔıʇɐɯoʇnɐ oʇ ɹǝןןoɹʇuoɔ ɐ uo ʞɔıןƆ-ᴚ + ʇɟıɥS",
"item.gtceu.text_module": "ǝןnpoW ʇxǝ⟘",
"item.gtceu.tiny_ash_dust": "sǝɥsⱯ ɟo ǝןıԀ ʎuı⟘",
"item.gtceu.tiny_basaltic_mineral_sand_dust": "puɐS ןɐɹǝuıW ɔıʇןɐsɐᗺ ɟo ǝןıԀ ʎuı⟘",
Expand Down Expand Up @@ -4836,7 +4839,7 @@
"item.gtceu.tool.lv_screwdriver.tooltip": "sǝuıɥɔɐW puɐ sɹǝʌoƆ sʇsnظpⱯ8§",
"item.gtceu.tool.lv_wirecutter": ")ΛꞀ( ɹǝʇʇnƆ ǝɹıM %s",
"item.gtceu.tool.lv_wrench": ")ΛꞀ( ɥɔuǝɹM %s",
"item.gtceu.tool.lv_wrench.tooltip": "sǝuıɥɔɐW ǝןʇuɐɯsıp oʇs ʞɔıןɔ ʇɟǝן pןoH8§",
"item.gtceu.tool.lv_wrench.tooltip": "sǝuıɥɔɐW ǝןʇuɐɯsıp ʞɔıןɔ ʇɟǝן pןoH8§",
"item.gtceu.tool.mallet": "ʇǝןןɐW ʇɟoS %s",
"item.gtceu.tool.mallet.tooltip.0": "˙ǝdıɔǝᴚ ʇuǝɹɹnƆ ɹǝʇɟⱯ ǝuıɥɔɐW ǝsnɐԀ oʇ ʞɐǝuS8§",
"item.gtceu.tool.mallet.tooltip.1": "sǝuıɥɔɐW sʇɹɐʇS/sdoʇS8§",
Expand Down Expand Up @@ -5698,20 +5701,24 @@
"metaarmor.message.nightvision.disabled": "ɟɟOɔ§ :uoısıΛʇɥbıNq§",
"metaarmor.message.nightvision.enabled": "uOɐ§ :uoısıΛʇɥbıNq§",
"metaarmor.message.nightvision.error": "¡ɹǝʍod ɥbnouǝ ʇoNɔ§",
"metaarmor.nms.boosted_jump.disabled": "pǝןqɐsıᗡ ʇsooᗺ dɯnſ :ǝʇınS ™ǝןɔsnWouɐN",
"metaarmor.nms.boosted_jump.enabled": "pǝןqɐuƎ ʇsooᗺ dɯnſ :ǝʇınS ™ǝןɔsnWouɐN",
"metaarmor.nms.nightvision.disabled": "pǝןqɐsıᗡ uoısıΛʇɥbıN :ǝʇınS ™ǝןɔsnWouɐN",
"metaarmor.nms.nightvision.enabled": "pǝןqɐuƎ uoısıΛʇɥbıN :ǝʇınS ™ǝןɔsnWouɐN",
"metaarmor.nms.nightvision.error": "¡ɹǝʍod ɥbnouǝ ʇoNɔ§ :ǝʇınS ™ǝןɔsnWouɐN",
"metaarmor.nms.share.disable": "pǝןqɐsıᗡ buıbɹɐɥƆ :ǝʇınS ™ǝןɔsnWouɐN",
"metaarmor.nms.share.enable": "pǝןqɐuƎ buıbɹɐɥƆ :ǝʇınS ™ǝןɔsnWouɐN",
"metaarmor.nms.share.error": "¡buıbɹɐɥɔ ɹoɟ ɹǝʍod ɥbnouǝ ʇoNɔ§ :ǝʇınS ™ǝןɔsnWouɐN",
"metaarmor.nms.step_assist.disabled": "pǝןqɐsıᗡ ʇsıssⱯdǝʇS :ǝʇınS ™ǝןɔsnWouɐN",
"metaarmor.nms.step_assist.enabled": "pǝןqɐuƎ ʇsıssⱯdǝʇS :ǝʇınS ™ǝןɔsnWouɐN",
"metaarmor.qts.boosted_jump.disabled": "pǝןqɐsıᗡ ʇsooᗺ dɯnſ :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
"metaarmor.qts.boosted_jump.enabled": "pǝןqɐuƎ ʇsooᗺ dɯnſ :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
"metaarmor.qts.nightvision.disabled": "pǝןqɐsıᗡ uoısıΛʇɥbıN :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
"metaarmor.qts.nightvision.enabled": "pǝןqɐuƎ uoısıΛʇɥbıN :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
"metaarmor.qts.nightvision.error": "¡ɹǝʍod ɥbnouǝ ʇoNɔ§ :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
"metaarmor.qts.share.disable": "pǝןqɐsıᗡ buıbɹɐɥƆ :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
"metaarmor.qts.share.enable": "pǝןqɐuƎ buıbɹɐɥƆ :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
"metaarmor.qts.share.error": "¡buıbɹɐɥɔ ɹoɟ ɹǝʍod ɥbnouǝ ʇoNɔ§ :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
"metaarmor.qts.step_assist.disabled": "pǝןqɐsıᗡ ʇsıssⱯdǝʇS :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
"metaarmor.qts.step_assist.enabled": "pǝןqɐuƎ ʇsıssⱯdǝʇS :ǝʇınS ™ɥɔǝ⟘ʞɹɐnὉ",
"metaarmor.tooltip.autoeat": "ʎɹoʇuǝʌuI ɯoɹɟ pooℲ buıs∩ ʎq ɹɐᗺ pooℲ sǝɥsıuǝןdǝᴚ",
"metaarmor.tooltip.breath": "ɹɐᗺ ɥʇɐǝɹᗺ ɹǝʇɐʍɹǝpu∩ sǝɥsıuǝןdǝᴚ",
"metaarmor.tooltip.burning": "buıuɹnᗺ sǝıɟıןןnN",
Expand Down
28 changes: 14 additions & 14 deletions src/generated/resources/assets/gtceu/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
"behaviour.lighter.uses": "Remaining uses: %d",
"behaviour.memory_card.client_msg.cleared": "Stored configuration cleared",
"behaviour.memory_card.client_msg.copied": "Copied machine configuration",
"behaviour.memory_card.client_msg.missing_items": "Missing items required to paste configuration",
"behaviour.memory_card.client_msg.pasted": "Applied machine configuration",
"behaviour.memory_card.copy_target": "Copying: %s",
"behaviour.memory_card.disabled": "§cDisabled§r",
Expand Down Expand Up @@ -1745,6 +1746,7 @@
"config.gtceu.option.addLoot": "addLoot",
"config.gtceu.option.ae2": "ae2",
"config.gtceu.option.allowDrumsInputFluidsFromOutputSide": "allowDrumsInputFluidsFromOutputSide",
"config.gtceu.option.allowedImageDomains": "allowedImageDomains",
"config.gtceu.option.animationTime": "animationTime",
"config.gtceu.option.arcRecyclingYield": "arcRecyclingYield",
"config.gtceu.option.armorHud": "armorHud",
Expand Down Expand Up @@ -1892,7 +1894,7 @@
"config.gtceu.option.steelSteamMultiblocks": "steelSteamMultiblocks",
"config.gtceu.option.surfaceRockProspectRange": "surfaceRockProspectRange",
"config.gtceu.option.tankItemFluidPreview": "tankItemFluidPreview",
"config.gtceu.option.temperaturesInKelvin": "temperaturesInKelvin",
"config.gtceu.option.temperaturesInCelsius": "temperaturesInCelsius",
"config.gtceu.option.titaniumBoilerHeatSpeed": "titaniumBoilerHeatSpeed",
"config.gtceu.option.titaniumBoilerMaxTemperature": "titaniumBoilerMaxTemperature",
"config.gtceu.option.toggle": "toggle",
Expand Down Expand Up @@ -2616,8 +2618,8 @@
"gtceu.key.armor_mode_switch": "Armor Mode Switch",
"gtceu.key.enable_boots": "Enable Boosted Jump",
"gtceu.key.enable_jetpack": "Enable Jetpack",
"gtceu.key.tool_aoe_change": "Tool AoE Mode Switch",
"gtceu.key.enable_step_assist": "Enable StepAssist",
"gtceu.key.tool_aoe_change": "Tool AoE Mode Switch",
"gtceu.large_boiler": "Large Boiler",
"gtceu.large_chemical_reactor": "Large Chemical Reactor",
"gtceu.laser_engraver": "Laser Engraver",
Expand Down Expand Up @@ -4734,7 +4736,7 @@
"item.gtceu.talc_dust": "Talc",
"item.gtceu.tantalum_capacitor": "Tantalum Capacitor",
"item.gtceu.terminal": "Terminal",
"item.gtceu.terminal.tooltip": "Shift + R-Click on a controller to automatically build the multi-block",
"item.gtceu.terminal.tooltip": "Shift + R-Click on a controller to automatically build a multiblock with items from your inventory",
"item.gtceu.text_module": "Text Module",
"item.gtceu.tiny_ash_dust": "Tiny Pile of Ashes",
"item.gtceu.tiny_basaltic_mineral_sand_dust": "Tiny Pile of Basaltic Mineral Sand",
Expand Down Expand Up @@ -5699,26 +5701,24 @@
"metaarmor.message.nightvision.disabled": "§bNightVision: §cOff",
"metaarmor.message.nightvision.enabled": "§bNightVision: §aOn",
"metaarmor.message.nightvision.error": "§cNot enough power!",
"metaarmor.message.step_assist.disabled": "StepAssist: §cOff",
"metaarmor.message.step_assist.enabled": "StepAssist: §aOn",
"metaarmor.nms.nightvision.disabled": "NanoMuscle™ Suite: NightVision Disabled",
"metaarmor.nms.nightvision.enabled": "NanoMuscle™ Suite: NightVision Enabled",
"metaarmor.nms.nightvision.error": "NanoMuscle™ Suite: §cNot enough power!",
"metaarmor.qts.nightvision.disabled": "QuarkTech™ Suite: NightVision Disabled",
"metaarmor.qts.nightvision.enabled": "QuarkTech™ Suite: NightVision Enabled",
"metaarmor.qts.nightvision.error": "QuarkTech™ Suite: §cNot enough power!",
"metaarmor.nms.step_assist.disabled": "NanoMuscle™ Suite: StepAssist Disabled",
"metaarmor.nms.step_assist.enabled": "NanoMuscle™ Suite: StepAssist Enabled",
"metaarmor.qts.step_assist.disabled": "QuarkTech™ Suite: StepAssist Disabled",
"metaarmor.qts.step_assist.enabled": "QuarkTech™ Suite: StepAssist Enabled",
"metaarmor.nms.share.disable": "NanoMuscle™ Suite: Charging Disabled",
"metaarmor.nms.share.enable": "NanoMuscle™ Suite: Charging Enabled",
"metaarmor.nms.share.error": "NanoMuscle™ Suite: §cNot enough power for charging!",
"metaarmor.nms.step_assist.disabled": "NanoMuscle™ Suite: StepAssist Disabled",
"metaarmor.nms.step_assist.enabled": "NanoMuscle™ Suite: StepAssist Enabled",
"metaarmor.qts.boosted_jump.disabled": "QuarkTech™ Suite: Jump Boost Disabled",
"metaarmor.qts.boosted_jump.enabled": "QuarkTech™ Suite: Jump Boost Enabled",
"metaarmor.qts.nightvision.disabled": "QuarkTech™ Suite: NightVision Disabled",
"metaarmor.qts.nightvision.enabled": "QuarkTech™ Suite: NightVision Enabled",
"metaarmor.qts.nightvision.error": "QuarkTech™ Suite: §cNot enough power!",
"metaarmor.qts.share.disable": "QuarkTech™ Suite: Charging Disabled",
"metaarmor.qts.share.enable": "QuarkTech™ Suite: Charging Enabled",
"metaarmor.qts.share.error": "QuarkTech™ Suite: §cNot enough power for charging!",
"metaarmor.qts.boosted_jump.disabled": "QuarkTech™ Suite: Jump Boost Disabled",
"metaarmor.qts.boosted_jump.enabled": "QuarkTech™ Suite: Jump Boost Enabled",
"metaarmor.qts.step_assist.disabled": "QuarkTech™ Suite: StepAssist Disabled",
"metaarmor.qts.step_assist.enabled": "QuarkTech™ Suite: StepAssist Enabled",
"metaarmor.tooltip.autoeat": "Replenishes Food Bar by Using Food from Inventory",
"metaarmor.tooltip.breath": "Replenishes Underwater Breath Bar",
"metaarmor.tooltip.burning": "Nullifies Burning",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
}
],
"textures": {
"end": "gtceu:block/pipe/pipe_duct_in",
"side": "gtceu:block/pipe/pipe_duct_side"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
}
],
"textures": {
"end": "gtceu:block/pipe/pipe_duct_in",
"side": "gtceu:block/pipe/pipe_duct_side"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
}
],
"textures": {
"end": "gtceu:block/pipe/pipe_duct_in",
"side": "gtceu:block/pipe/pipe_duct_side"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
}
],
"textures": {
"end": "gtceu:block/pipe/pipe_laser_in",
"side": "gtceu:block/pipe/pipe_laser_side",
"side_overlay": "gtceu:block/pipe/pipe_laser_side_overlay"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,115 @@
{
"parent": "gtceu:block/pipe/normal_laser_pipe/center",
"parent": "minecraft:block/block",
"elements": [
{
"faces": {
"down": {
"texture": "#side",
"tintindex": 0
},
"east": {
"texture": "#side",
"tintindex": 0
},
"north": {
"texture": "#side",
"tintindex": 0
},
"south": {
"texture": "#side",
"tintindex": 0
},
"up": {
"texture": "#side",
"tintindex": 0
},
"west": {
"texture": "#side",
"tintindex": 0
}
},
"from": [
5,
5,
5
],
"to": [
11,
11,
11
]
},
{
"faces": {
"down": {
"forge_data": {
"ambient_occlusion": false,
"block_light": 15,
"sky_light": 15
},
"texture": "#side_overlay",
"tintindex": 2
},
"east": {
"forge_data": {
"ambient_occlusion": false,
"block_light": 15,
"sky_light": 15
},
"texture": "#side_overlay",
"tintindex": 2
},
"north": {
"forge_data": {
"ambient_occlusion": false,
"block_light": 15,
"sky_light": 15
},
"texture": "#side_overlay",
"tintindex": 2
},
"south": {
"forge_data": {
"ambient_occlusion": false,
"block_light": 15,
"sky_light": 15
},
"texture": "#side_overlay",
"tintindex": 2
},
"up": {
"forge_data": {
"ambient_occlusion": false,
"block_light": 15,
"sky_light": 15
},
"texture": "#side_overlay",
"tintindex": 2
},
"west": {
"forge_data": {
"ambient_occlusion": false,
"block_light": 15,
"sky_light": 15
},
"texture": "#side_overlay",
"tintindex": 2
}
},
"from": [
4.998,
4.998,
4.998
],
"to": [
11.002,
11.002,
11.002
]
}
],
"textures": {
"side": "gtceu:block/pipe/pipe_laser_side",
"side_overlay": "gtceu:block/pipe/pipe_laser_side_overlay_emissive"
}
}
Loading