Merge pull request #2 from GTNewHorizons/experimental

5.09.33.57

41 files changed, 32 insertions, 3 deletions

diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index 51b648b308..158d108278 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -1,3 +1,25 @@
+# Multiblock Tooltip Builder Keywords
+# Context can be found in the class gregtech.api.util.GT_Multiblock_Tooltip_Builder
+GT5U.MBTT.MachineType=Machine Type
+GT5U.MBTT.Dimensions=Dimensions
+GT5U.MBTT.Hollow=(Hollow)
+GT5U.MBTT.Structure=Structure
+GT5U.MBTT.Controller=Controller
+GT5U.MBTT.Minimum=(minimum)
+GT5U.MBTT.MaintenanceHatch=Maintenance Hatch
+GT5U.MBTT.MufflerHatch=Muffler Hatch
+GT5U.MBTT.EnergyHatch=Energy Hatch
+GT5U.MBTT.DynamoHatch=Dynamo Hatch
+GT5U.MBTT.InputBus=Input Bus
+GT5U.MBTT.InputHatch=Input Hatch
+GT5U.MBTT.OutputBus=Output Bus
+GT5U.MBTT.OutputHatch=Output Hatch
+GT5U.MBTT.Causes=Causes
+GT5U.MBTT.PPS=pollution per second
+GT5U.MBTT.Hold=Hold
+GT5U.MBTT.Display=to display structure guidelines
+GT5U.MBTT.Mod=Added by
+
 GT5U.turbine.running.true=Turbine running
 GT5U.turbine.running.false=Turbine stopped
 GT5U.turbine.maintenance.false=No Maintainance issues
@@ -41,9 +63,11 @@ GT5U.machines.separatebus=Input busses are separated
 GT5U.machines.pumpareaset=Pumping area set to
 GT5U.machines.oilfluidpump=Oil/Fluid Pump
 GT5U.machines.minermulti=Multiblock Miner
+GT5U.machines.voidoveflow.enabled=Overflow voiding enabled
+GT5U.machines.voidoveflow.disabled=Overflow voiding disabled
 
-
-
+GT5U.hatch.disableFilter.true=Input Filter Off
+GT5U.hatch.disableFilter.false=Input Filter On
 
 GT5U.multiblock.pollution=Pollution reduced to
 GT5U.multiblock.energy=Stored Energy
@@ -815,6 +839,8 @@ achievement.gt.blockmachines.multimachine.em.emtoessentia=Essentia Dequantizer
 achievement.gt.blockmachines.multimachine.em.emtoessentia.desc=Pickup this item to see the recipe in NEI
 achievement.gt.blockmachines.multimachine.em.scanner=Elemental Scanner
 achievement.gt.blockmachines.multimachine.em.scanner.desc=Pickup this item to see the recipe in NEI
+achievement.gt.blockmachines.multimachine.em.scanner=Data Bank
+achievement.gt.blockmachines.multimachine.em.databank.desc=Pickup this item to see the recipe in NEI
 achievement.gt.blockcasingsTT.8=Hollow Casing
 achievement.gt.blockcasingsTT.8.desc=Pickup this item to see the recipe in NEI
 achievement.gt.blockcasingsTT.7=Molecular Coil
@@ -854,6 +880,9 @@ achievement.ic2.itemArmorQuantumBoots.desc=Pickup this item to see the recipe in
 achievement.item.graviChestPlate=Gravi Chestplate
 achievement.item.graviChestPlate.desc=Pickup this item to see the recipe in NEI
 
+achievement.gt.blockreinforced.12=Raw Deep Dark Portal Block
+achievement.gt.blockreinforced.12.desc=Pickup this item to see the recipe in NEI
+
 for.bees.species.clay=Clay
 for.bees.species.slimeball=Slimeball
 for.bees.species.peat=Peat
@@ -1011,4 +1040,4 @@ gregtech.areaExploratory=Exploratory
 gregtech.speedUnproductive=Unproductive
 gregtech.speedAccelerated=Accelerated
 gregtech.lifeBlink=Blink 
-gregtech.lifeEon=Eon
\ No newline at end of file
+gregtech.lifeEon=Eon
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DEEP_DARK_RAW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DEEP_DARK_RAW.png
new file mode 100644
index 0000000000..e5cde1022b
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DEEP_DARK_RAW.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.png
index bb2f520e30..ad24535fe7 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_ENGINE_INTAKE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_ENGINE_INTAKE.png
new file mode 100644
index 0000000000..2e72f13642
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_ENGINE_INTAKE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_TITANIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_TITANIUM.png
index fc305ea675..d680025de6 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_TITANIUM.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_TITANIUM.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EXTREME_DIESEL_ENGINE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EXTREME_DIESEL_ENGINE.png
new file mode 100644
index 0000000000..bc1dd3f5f0
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EXTREME_DIESEL_ENGINE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EXTREME_DIESEL_ENGINE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EXTREME_DIESEL_ENGINE_ACTIVE.png
new file mode 100644
index 0000000000..b57178136f
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EXTREME_DIESEL_ENGINE_ACTIVE.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/GuiButtons.png b/src/main/resources/assets/gregtech/textures/gui/GuiButtons.png
index f9b1d69325..54f5230e7a 100644
--- a/src/main/resources/assets/gregtech/textures/gui/GuiButtons.png
+++ b/src/main/resources/assets/gregtech/textures/gui/GuiButtons.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeExtremeDieselEngine.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeExtremeDieselEngine.png
new file mode 100644
index 0000000000..cfe27fccf1
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeExtremeDieselEngine.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/0.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/0.png
new file mode 100644
index 0000000000..e35727ec34
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/0.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/1.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/1.png
new file mode 100644
index 0000000000..d2b07c8a6c
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/1.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/10.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/10.png
new file mode 100644
index 0000000000..d3648dbd35
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/10.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/11.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/11.png
new file mode 100644
index 0000000000..ccf9f81399
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/11.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/12.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/12.png
new file mode 100644
index 0000000000..3150356e16
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/12.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/13.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/13.png
new file mode 100644
index 0000000000..0f5d3c1ca5
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/13.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/14.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/14.png
new file mode 100644
index 0000000000..8109357533
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/14.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/15.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/15.png
new file mode 100644
index 0000000000..1bc89f80b2
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/15.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/16.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/16.png
new file mode 100644
index 0000000000..4cf2f0d825
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/16.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/17.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/17.png
new file mode 100644
index 0000000000..3ac05fd824
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/17.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/18.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/18.png
new file mode 100644
index 0000000000..b668f379cf
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/18.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/19.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/19.png
new file mode 100644
index 0000000000..d13a9415cd
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/19.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/2.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/2.png
new file mode 100644
index 0000000000..b31f73a4f7
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/2.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/20.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/20.png
new file mode 100644
index 0000000000..5858bc43b8
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/20.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/21.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/21.png
new file mode 100644
index 0000000000..e7d903a404
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/21.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/22.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/22.png
new file mode 100644
index 0000000000..45d56bb2e7
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/22.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/23.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/23.png
new file mode 100644
index 0000000000..5d2a8f638a
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/23.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/24.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/24.png
new file mode 100644
index 0000000000..78f30e2299
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/24.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/3.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/3.png
new file mode 100644
index 0000000000..996887e4ef
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/3.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/4.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/4.png
new file mode 100644
index 0000000000..0ef50ef775
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/4.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/5.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/5.png
new file mode 100644
index 0000000000..2b67a655f5
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/5.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/6.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/6.png
new file mode 100644
index 0000000000..a30a06a13c
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/6.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/7.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/7.png
new file mode 100644
index 0000000000..e5dfc35674
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/7.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/8.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/8.png
new file mode 100644
index 0000000000..0ed9386325
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/8.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/9.png b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/9.png
new file mode 100644
index 0000000000..97398ff800
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.integrated_circuit/9.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/595.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/595.png
index 72b0694ac9..d1e8d87970 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/595.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/595.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/619.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/619.png
index a8396ee2c8..9e7f633eeb 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/619.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/619.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/639.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/639.png
index 170df57eba..60ee29468d 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/639.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/639.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/649.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/649.png
index 33902261ed..da14e263ec 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/649.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/649.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/659.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/659.png
index 5e010b144a..ef63027fcf 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/659.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/659.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/689.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/689.png
index 23a5518540..f8a83ab2f5 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/689.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/689.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/699.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/699.png
index 4529793d67..7a59b8d4d3 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/699.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/699.png