diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-10-30 13:06:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-30 13:06:47 +0200 |
| commit | cee84d9882ae4f988891856eba8c31ebd383e7ff (patch) | |
| tree | bfde18f6d875e23ca0e4ecff3be3d04d1e87abfc /src/main/resources | |
| parent | f798f8a8a6fb3ca13d35928d49525d384b6302cc (diff) | |
| parent | 64b07bba3aad35118bda5289aecc85cdccffbc27 (diff) | |
| download | GT5-Unofficial-cee84d9882ae4f988891856eba8c31ebd383e7ff.tar.gz GT5-Unofficial-cee84d9882ae4f988891856eba8c31ebd383e7ff.tar.bz2 GT5-Unofficial-cee84d9882ae4f988891856eba8c31ebd383e7ff.zip | |
Merge branch 'experimental' into Boxinator
Diffstat (limited to 'src/main/resources')
57 files changed, 4 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index e173f9cfea..fba0af15df 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -72,6 +72,10 @@ GT5U.machines.voidoveflow.disabled=Overflow voiding disabled GT5U.hatch.disableFilter.true=Input Filter Off GT5U.hatch.disableFilter.false=Input Filter On +GT5U.hatch.disableSort.true=Sorting mode: OFF +GT5U.hatch.disableSort.false=Sorting mode: ON +GT5U.hatch.disableLimited.true=Limiting mode: OFF +GT5U.hatch.disableLimited.false=Limiting mode: ON GT5U.multiblock.pollution=Pollution reduced to GT5U.multiblock.energy=Stored Energy diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FLUID_IN_SIGN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FLUID_IN_SIGN.png Binary files differnew file mode 100644 index 0000000000..a78a13db69 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FLUID_IN_SIGN.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FLUID_OUT_SIGN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FLUID_OUT_SIGN.png Binary files differnew file mode 100644 index 0000000000..60aa2fe90a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FLUID_OUT_SIGN.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/ITEM_IN_SIGN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/ITEM_IN_SIGN.png Binary files differnew file mode 100644 index 0000000000..10dd12f753 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/ITEM_IN_SIGN.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/ITEM_OUT_SIGN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/ITEM_OUT_SIGN.png Binary files differnew file mode 100644 index 0000000000..831650cb28 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/ITEM_OUT_SIGN.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_IRIDIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_IRIDIUM.png Binary files differnew file mode 100644 index 0000000000..0aa1df15fe --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_IRIDIUM.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGICAL.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGICAL.png Binary files differnew file mode 100644 index 0000000000..822e0e4147 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGICAL.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_RHODIUM_PALLADIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_RHODIUM_PALLADIUM.png Binary files differnew file mode 100644 index 0000000000..2b26fcd3e0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_RHODIUM_PALLADIUM.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_RESEARCH_COMPLETER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_RESEARCH_COMPLETER.png Binary files differnew file mode 100644 index 0000000000..da0ce84a35 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_RESEARCH_COMPLETER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE.png Binary files differnew file mode 100644 index 0000000000..89277c79d6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE_GLOW.png Binary files differnew file mode 100644 index 0000000000..4a8ad42dd8 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE_GLOW.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_RESEARCH_COMPLETER_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_RESEARCH_COMPLETER_GLOW.png Binary files differnew file mode 100644 index 0000000000..1227d5a7fd --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_RESEARCH_COMPLETER_GLOW.png diff --git a/src/main/resources/assets/gregtech/textures/gui/OutputHatch.png b/src/main/resources/assets/gregtech/textures/gui/OutputHatch.png Binary files differnew file mode 100644 index 0000000000..e0fd3f527e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/OutputHatch.png diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave2.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave2.png Binary files differnew file mode 100644 index 0000000000..f51e49403e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave2.png diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave3.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave3.png Binary files differnew file mode 100644 index 0000000000..246016646a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave3.png diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave4.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave4.png Binary files differnew file mode 100644 index 0000000000..7a36109656 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave4.png diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalBath.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalBath.png Binary files differindex 9a2e4ff2ab..bf2d8d2b37 100644 --- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalBath.png +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalBath.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/17.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/17.png Binary files differnew file mode 100644 index 0000000000..d1e8d87970 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/17.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/18.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/18.png Binary files differnew file mode 100644 index 0000000000..d1e8d87970 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/18.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/19.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/19.png Binary files differnew file mode 100644 index 0000000000..d1e8d87970 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/19.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/20.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/20.png Binary files differnew file mode 100644 index 0000000000..d1e8d87970 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/20.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/21.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/21.png Binary files differnew file mode 100644 index 0000000000..d1e8d87970 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/21.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/22.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/22.png Binary files differnew file mode 100644 index 0000000000..da14e263ec --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/22.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/23.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/23.png Binary files differnew file mode 100644 index 0000000000..da14e263ec --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/23.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/24.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/24.png Binary files differnew file mode 100644 index 0000000000..da14e263ec --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/24.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/25.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/25.png Binary files differnew file mode 100644 index 0000000000..da14e263ec --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/25.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/26.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/26.png Binary files differnew file mode 100644 index 0000000000..da14e263ec --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/26.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/27.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/27.png Binary files differnew file mode 100644 index 0000000000..9e7f633eeb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/27.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/28.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/28.png Binary files differnew file mode 100644 index 0000000000..9e7f633eeb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/28.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/29.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/29.png Binary files differnew file mode 100644 index 0000000000..9e7f633eeb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/29.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/30.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/30.png Binary files differnew file mode 100644 index 0000000000..9e7f633eeb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/30.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/31.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/31.png Binary files differnew file mode 100644 index 0000000000..9e7f633eeb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/31.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/32.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/32.png Binary files differnew file mode 100644 index 0000000000..60ee29468d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/32.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/33.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/33.png Binary files differnew file mode 100644 index 0000000000..60ee29468d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/33.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/34.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/34.png Binary files differnew file mode 100644 index 0000000000..60ee29468d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/34.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/35.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/35.png Binary files differnew file mode 100644 index 0000000000..60ee29468d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/35.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/36.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/36.png Binary files differnew file mode 100644 index 0000000000..60ee29468d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/36.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/37.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/37.png Binary files differnew file mode 100644 index 0000000000..ef63027fcf --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/37.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/38.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/38.png Binary files differnew file mode 100644 index 0000000000..ef63027fcf --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/38.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/39.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/39.png Binary files differnew file mode 100644 index 0000000000..ef63027fcf --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/39.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/40.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/40.png Binary files differnew file mode 100644 index 0000000000..ef63027fcf --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/40.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/41.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/41.png Binary files differnew file mode 100644 index 0000000000..ef63027fcf --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/41.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/42.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/42.png Binary files differnew file mode 100644 index 0000000000..f8a83ab2f5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/42.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/43.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/43.png Binary files differnew file mode 100644 index 0000000000..f8a83ab2f5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/43.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/44.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/44.png Binary files differnew file mode 100644 index 0000000000..f8a83ab2f5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/44.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/45.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/45.png Binary files differnew file mode 100644 index 0000000000..f8a83ab2f5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/45.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/46.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/46.png Binary files differnew file mode 100644 index 0000000000..f8a83ab2f5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/46.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/47.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/47.png Binary files differnew file mode 100644 index 0000000000..7a59b8d4d3 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/47.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/48.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/48.png Binary files differnew file mode 100644 index 0000000000..7a59b8d4d3 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/48.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/49.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/49.png Binary files differnew file mode 100644 index 0000000000..7a59b8d4d3 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/49.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/50.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/50.png Binary files differnew file mode 100644 index 0000000000..7a59b8d4d3 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/50.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/51.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/51.png Binary files differnew file mode 100644 index 0000000000..7a59b8d4d3 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/51.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/52.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/52.png Binary files differnew file mode 100644 index 0000000000..968385400f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/52.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/53.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/53.png Binary files differnew file mode 100644 index 0000000000..968385400f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/53.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/54.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/54.png Binary files differnew file mode 100644 index 0000000000..968385400f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/54.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/55.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/55.png Binary files differnew file mode 100644 index 0000000000..968385400f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/55.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/56.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/56.png Binary files differnew file mode 100644 index 0000000000..968385400f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/56.png |
