diff options
Diffstat (limited to 'src/main/resources')
49 files changed, 41 insertions, 1 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BUCK.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BUCK.png Binary files differnew file mode 100644 index 0000000000..6aa75eff68 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BUCK.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BUCK_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BUCK_ACTIVE.png Binary files differnew file mode 100644 index 0000000000..b8333cd837 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BUCK_ACTIVE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER.png Binary files differindex 910d8cf7cd..187394cf54 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE.png Binary files differindex b9efef601a..9d3bfe7284 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE_SLAVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE_SLAVE.png Binary files differnew file mode 100644 index 0000000000..e76cd31b5e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE_SLAVE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE_SLAVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE_SLAVE.png.mcmeta new file mode 100644 index 0000000000..97596ba817 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE_SLAVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_SLAVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_SLAVE.png Binary files differnew file mode 100644 index 0000000000..58cb0a9573 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_SLAVE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_SLAVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_SLAVE.png.mcmeta new file mode 100644 index 0000000000..5e86a7cd5f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_SLAVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":8 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_BOTTOM.png Binary files differnew file mode 100644 index 0000000000..af2b3b2037 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_BOTTOM.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_SIDE.png Binary files differnew file mode 100644 index 0000000000..af2b3b2037 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_SIDE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_TOP.png Binary files differnew file mode 100644 index 0000000000..af2b3b2037 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_TOP.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_BOTTOM.png Binary files differnew file mode 100644 index 0000000000..ad519ab78d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_BOTTOM.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_SIDE.png Binary files differnew file mode 100644 index 0000000000..ad519ab78d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_SIDE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_TOP.png Binary files differnew file mode 100644 index 0000000000..ad519ab78d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_TOP.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_BOTTOM.png Binary files differnew file mode 100644 index 0000000000..27a092adf4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_BOTTOM.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_SIDE.png Binary files differnew file mode 100644 index 0000000000..27a092adf4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_SIDE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_TOP.png Binary files differnew file mode 100644 index 0000000000..27a092adf4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_TOP.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_BOTTOM.png Binary files differnew file mode 100644 index 0000000000..a2d780dc32 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_BOTTOM.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_SIDE.png Binary files differnew file mode 100644 index 0000000000..a2d780dc32 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_SIDE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_TOP.png Binary files differnew file mode 100644 index 0000000000..a2d780dc32 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_TOP.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_BOTTOM.png Binary files differnew file mode 100644 index 0000000000..a401c3900d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_BOTTOM.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_SIDE.png Binary files differnew file mode 100644 index 0000000000..a401c3900d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_SIDE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_TOP.png Binary files differnew file mode 100644 index 0000000000..a401c3900d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_TOP.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_BOTTOM.png Binary files differnew file mode 100644 index 0000000000..a3564826ac --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_BOTTOM.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_SIDE.png Binary files differnew file mode 100644 index 0000000000..a3564826ac --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_SIDE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_TOP.png Binary files differnew file mode 100644 index 0000000000..a3564826ac --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_TOP.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_POWER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_POWER.png Binary files differnew file mode 100644 index 0000000000..02393fe829 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_POWER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_POWER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_POWER.png Binary files differnew file mode 100644 index 0000000000..399b32696d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_POWER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OWNER_OFFLINE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OWNER_OFFLINE.png Binary files differnew file mode 100644 index 0000000000..ebf319261a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OWNER_OFFLINE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OWNER_ONLINE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OWNER_ONLINE.png Binary files differnew file mode 100644 index 0000000000..ba8786cf7e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OWNER_ONLINE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/READER_OFFLINE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/READER_OFFLINE.png Binary files differnew file mode 100644 index 0000000000..ee04fde165 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/READER_OFFLINE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/READER_OFFLINE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/READER_OFFLINE.png.mcmeta new file mode 100644 index 0000000000..5e86a7cd5f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/READER_OFFLINE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":8 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/READER_ONLINE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/READER_ONLINE.png Binary files differnew file mode 100644 index 0000000000..cfb2f8aaa7 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/READER_ONLINE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/READER_ONLINE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/READER_ONLINE.png.mcmeta new file mode 100644 index 0000000000..5e86a7cd5f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/READER_ONLINE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":8 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/dataReader.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/dataReader.png Binary files differnew file mode 100644 index 0000000000..57a9b85ce9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/dataReader.png diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png Binary files differindex 95aa09beae..e67f96e34e 100644 --- a/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png +++ b/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index 20160069e4..ccb17a8a0c 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -4,8 +4,10 @@ tile.quantumStuff.name=Quantum Stuff item.em.debugContainer.name=Debug EM Container item.em.definitionContainer.name=EM Recipe Hint item.em.definitionScanStorage.name=EM Scan Storage -item.em.debugBuilder.name=Multiblock Machine Blueprint +item.em.constructable.name=Multiblock Machine Blueprint +item.em.frontRotate.name=Front Rotation Scrench item.em.parametrizerMemoryCard.name=Parametrizer Memory Card +item.em.EuMeterGT.name=GT EU meter death.attack.microwaving=%1$s was dehydrated by radiation. death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s. diff --git a/src/main/resources/assets/tectech/lang/zh_CN.lang b/src/main/resources/assets/tectech/lang/zh_CN.lang new file mode 100644 index 0000000000..5359f04e9b --- /dev/null +++ b/src/main/resources/assets/tectech/lang/zh_CN.lang @@ -0,0 +1,13 @@ +itemGroup.TecTech=泛次元钛克科技黑洞研究所 +tile.quantumGlass.name=量子玻璃 +tile.quantumStuff.name=量子物质 +item.em.debugContainer.name=调试用 EM容器 +item.em.definitionContainer.name=EM配方指引 +item.em.debugBuilder.name=多方块机器蓝图 +item.em.parametrizerMemoryCard.name=参量机记忆卡 + +death.attack.microwaving=%1$s 被辐射脱水 +death.attack.microwaving.player=%1$s 在与 %2$s 战斗中被辐射脱水 + +death.attack.elementalPollution=%1$s 被蒸发了 +death.attack.elementalPollution.player=%1$s 在与 %2$s 战斗中被蒸发了 diff --git a/src/main/resources/assets/tectech/sounds.json b/src/main/resources/assets/tectech/sounds.json index c4049f5f02..e23f1c1196 100644 --- a/src/main/resources/assets/tectech/sounds.json +++ b/src/main/resources/assets/tectech/sounds.json @@ -4,6 +4,11 @@ "subtitle": "tectech.subtitle.microwave_ding", "sounds": [{"name": "microwave_ding","stream": false}] }, + "fx_scan": { + "category": "block", + "subtitle": "tectech.subtitle.fx_scan", + "sounds": [{"name": "fx_scan","stream": false}] + }, "fx_alarm": { "category": "block", "subtitle": "tectech.subtitle.fx_alarm", diff --git a/src/main/resources/assets/tectech/sounds/fx_scan.ogg b/src/main/resources/assets/tectech/sounds/fx_scan.ogg Binary files differnew file mode 100644 index 0000000000..0b50e0ca76 --- /dev/null +++ b/src/main/resources/assets/tectech/sounds/fx_scan.ogg diff --git a/src/main/resources/assets/tectech/textures/gui/assLineRender.png b/src/main/resources/assets/tectech/textures/gui/assLineRender.png Binary files differnew file mode 100644 index 0000000000..cc1cd35a7d --- /dev/null +++ b/src/main/resources/assets/tectech/textures/gui/assLineRender.png diff --git a/src/main/resources/assets/tectech/textures/items/itemDebugBuilder.png b/src/main/resources/assets/tectech/textures/items/itemConstructable.png Binary files differindex dd2b6911c9..dd2b6911c9 100644 --- a/src/main/resources/assets/tectech/textures/items/itemDebugBuilder.png +++ b/src/main/resources/assets/tectech/textures/items/itemConstructable.png diff --git a/src/main/resources/assets/tectech/textures/items/itemEuMeterGT.png b/src/main/resources/assets/tectech/textures/items/itemEuMeterGT.png Binary files differnew file mode 100644 index 0000000000..a3297c5dd4 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/items/itemEuMeterGT.png diff --git a/src/main/resources/assets/tectech/textures/items/itemFrontRotate.png b/src/main/resources/assets/tectech/textures/items/itemFrontRotate.png Binary files differnew file mode 100644 index 0000000000..2d5d2b2ad9 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/items/itemFrontRotate.png diff --git a/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardLocked.png b/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardLocked.png Binary files differindex 0ef5e35895..2bdbb54ab7 100644 --- a/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardLocked.png +++ b/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardLocked.png diff --git a/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardUnlocked.png b/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardUnlocked.png Binary files differindex 1a4c0dc9bc..b61a1725af 100644 --- a/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardUnlocked.png +++ b/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardUnlocked.png diff --git a/src/main/resources/com/github/technus/tectech/elementalMatter/definitions/complex/atom/energyLevels.csv b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/energyLevels.csv index 484768d8b7..484768d8b7 100644 --- a/src/main/resources/com/github/technus/tectech/elementalMatter/definitions/complex/atom/energyLevels.csv +++ b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/energyLevels.csv diff --git a/src/main/resources/com/github/technus/tectech/elementalMatter/definitions/complex/atom/nuclides.csv b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclides.csv index 495aee32bf..495aee32bf 100644 --- a/src/main/resources/com/github/technus/tectech/elementalMatter/definitions/complex/atom/nuclides.csv +++ b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclides.csv diff --git a/src/main/resources/com/github/technus/tectech/elementalMatter/definitions/complex/atom/nuclidesTable.csv b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclidesTable.csv index 783276227a..783276227a 100644 --- a/src/main/resources/com/github/technus/tectech/elementalMatter/definitions/complex/atom/nuclidesTable.csv +++ b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclidesTable.csv |
