aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKiwi <42833050+Kiwi233@users.noreply.github.com>2020-05-22 20:23:55 +0800
committerGitHub <noreply@github.com>2020-05-22 20:23:55 +0800
commit56689ec7b67c46c882d49da4742770e3397a4e9f (patch)
tree879a3372906ec2c5f2a53a4ac46f7dde860a654f
parentbc19f3ab32c9bccbf936bbeffcc8ddad967ffffd (diff)
parent306a0822c27c59cdbd0a61698939a2dfc02068d2 (diff)
downloadGT5-Unofficial-56689ec7b67c46c882d49da4742770e3397a4e9f.tar.gz
GT5-Unofficial-56689ec7b67c46c882d49da4742770e3397a4e9f.tar.bz2
GT5-Unofficial-56689ec7b67c46c882d49da4742770e3397a4e9f.zip
Merge pull request #1 from kekzdealer/master
5/22
-rw-r--r--.classpath4
-rw-r--r--.gitignore31
-rw-r--r--.idea/.gitignore3
-rw-r--r--.idea/.name1
-rw-r--r--.idea/codeStyles/Project.xml7
-rw-r--r--.idea/codeStyles/codeStyleConfig.xml5
-rw-r--r--.idea/dictionaries/kekzd.xml10
-rw-r--r--.idea/misc.xml6
-rw-r--r--.idea/modules.xml9
-rw-r--r--.idea/uiDesigner.xml124
-rw-r--r--.idea/vcs.xml6
-rw-r--r--GregTech.cfg1
-rw-r--r--GregTech.lang31980
-rw-r--r--asm/ccl_modular/net#minecraft#client#gui#inventory#GuiBeacon$CancelButton.txt87
-rw-r--r--asm/ccl_modular/net#minecraft#client#gui#inventory#GuiBeacon$ConfirmButton.txt87
-rw-r--r--asm/ccl_modular/net#minecraft#client#gui#inventory#GuiBeacon$PowerButton.txt155
-rw-r--r--build.gradle2
-rw-r--r--config/CodeChickenCore.cfg27
-rw-r--r--config/CodeChickenLib.cfg8
-rw-r--r--config/GregTech/GregTech.cfg241
-rw-r--r--config/GregTech/IDs.cfg2
-rw-r--r--config/GregTech/MachineStats.cfg47
-rw-r--r--config/GregTech/MaterialComponents.cfg55
-rw-r--r--config/GregTech/MaterialProperties.cfg28588
-rw-r--r--config/GregTech/ModularArmor.cfg1813
-rw-r--r--config/GregTech/Other.cfg10
-rw-r--r--config/GregTech/OverpoweredStuff.cfg141
-rw-r--r--config/GregTech/Recipes.cfg39439
-rw-r--r--config/GregTech/Unification.cfg4163
-rw-r--r--config/GregTech/WorldGeneration.cfg2606
-rw-r--r--config/IC2.ini168
-rw-r--r--config/NEI/client.cfg62
-rw-r--r--config/Ztones.cfg58
-rw-r--r--config/devtips.cfg26
-rw-r--r--config/endercore/cropConfig.json21
-rw-r--r--config/endercore/endercore.cfg108
-rw-r--r--config/enderio/AlloySmelterRecipes_Core.xml408
-rw-r--r--config/enderio/AlloySmelterRecipes_User.xml31
-rw-r--r--config/enderio/EnchanterRecipes_Core.xml118
-rw-r--r--config/enderio/EnchanterRecipes_User.xml27
-rw-r--r--config/enderio/EnderIO.cfg1058
-rw-r--r--config/enderio/OreDictionaryPreferences_Core.xml105
-rw-r--r--config/enderio/OreDictionaryPreferences_User.xml7
-rw-r--r--config/enderio/PainterPaintSources_Core.xml36
-rw-r--r--config/enderio/PainterPaintSources_User.xml15
-rw-r--r--config/enderio/PoweredSpawnerConfig_Core.json50
-rw-r--r--config/enderio/PoweredSpawnerConfig_User.json9
-rw-r--r--config/enderio/SAGMillRecipes_Core.xml2982
-rw-r--r--config/enderio/SAGMillRecipes_User.xml101
-rw-r--r--config/enderio/SliceAndSpliceRecipes_Core.xml67
-rw-r--r--config/enderio/SliceAndSpliceRecipes_User.xml3
-rw-r--r--config/enderio/VatRecipes_Core.xml133
-rw-r--r--config/enderio/VatRecipes_User.xml3
-rw-r--r--config/forge.cfg57
-rw-r--r--config/forgeChunkLoading.cfg47
-rw-r--r--config/splash.properties14
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin51017 -> 52818 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
-rw-r--r--gradlew169
-rw-r--r--gradlew.bat14
-rw-r--r--libs/TecTech-1.7.10-3.8.1-dev.jarbin0 -> 3382312 bytes
-rw-r--r--libs/Thaumcraft-1.7.10-4.2.3.5-deobf.jarbin0 -> 12573290 bytes
-rw-r--r--libs/ThaumicTinkerer-1.7.10 2.5-1.7.10-555-deobf.jarbin0 -> 2158646 bytes
-rw-r--r--libs/Ztones-1.7.10-2.2.2-deobf.jarbin557656 -> 0 bytes
-rw-r--r--libs/gregtech-5.09.33.44-dev.jar (renamed from libs/gregtech-5.09.32-dev.jar)bin17028484 -> 11120310 bytes
-rw-r--r--logs/2019-10-10-1.log.gzbin1583 -> 0 bytes
-rw-r--r--logs/2019-10-11-1.log.gzbin406 -> 0 bytes
-rw-r--r--logs/2019-10-11-2.log.gzbin288 -> 0 bytes
-rw-r--r--logs/2019-10-11-3.log.gzbin281 -> 0 bytes
-rw-r--r--logs/2019-10-11-4.log.gzbin788 -> 0 bytes
-rw-r--r--logs/2019-10-11-5.log.gzbin786 -> 0 bytes
-rw-r--r--logs/2019-10-11-6.log.gzbin1242 -> 0 bytes
-rw-r--r--logs/2019-10-11-7.log.gzbin701 -> 0 bytes
-rw-r--r--logs/2019-10-13-1.log.gzbin712 -> 0 bytes
-rw-r--r--logs/2019-10-13-2.log.gzbin713 -> 0 bytes
-rw-r--r--logs/2019-10-13-3.log.gzbin715 -> 0 bytes
-rw-r--r--logs/2019-10-13-4.log.gzbin703 -> 0 bytes
-rw-r--r--logs/2019-10-13-5.log.gzbin722 -> 0 bytes
-rw-r--r--logs/2019-10-13-6.log.gzbin802 -> 0 bytes
-rw-r--r--mods/1.7.10/Baubles-1.7.10-1.0.1.11.jarbin0 -> 86746 bytes
-rw-r--r--mods/EnderCore-1.7.10-0.2.0.39_beta.jars (renamed from mods/EnderCore-1.7.10-0.2.0.39_beta.jar)bin467824 -> 467824 bytes
-rw-r--r--mods/EnderIO-1.7.10-2.3.0.432_beta.jars (renamed from mods/EnderIO-1.7.10-2.3.0.432_beta.jar)bin4800552 -> 4800552 bytes
-rw-r--r--mods/YAMCore-1.7.10-0.5.78.jarbin0 -> 100213 bytes
-rw-r--r--mods/bartworks[1.7.10]-0.5.13_pre10.jarbin0 -> 885812 bytes
-rw-r--r--options.txt110
-rw-r--r--saves/NEI/client.dat0
-rw-r--r--src/main/java/blocks/Block_ControlRod.java30
-rw-r--r--src/main/java/blocks/Block_GDCUnit.java31
-rw-r--r--src/main/java/blocks/Block_ItemProxyCable.java45
-rw-r--r--src/main/java/blocks/Block_ItemProxyEndpoint.java69
-rw-r--r--src/main/java/blocks/Block_ItemProxySource.java69
-rw-r--r--src/main/java/blocks/Block_ItemServerIOPort.java41
-rw-r--r--src/main/java/blocks/Block_ItemServerRackCasing.java33
-rw-r--r--src/main/java/blocks/Block_TFFTCasing.java31
-rw-r--r--src/main/java/blocks/Block_TFFTMultiHatch.java40
-rw-r--r--src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java37
-rw-r--r--src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java36
-rw-r--r--src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java36
-rw-r--r--src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java36
-rw-r--r--src/main/java/blocks/Block_TFFTStorageFieldBlockT5.java36
-rw-r--r--src/main/java/blocks/Block_YSZUnit.java31
-rw-r--r--src/main/java/client/gui/GUIContainer_ModularNuclearReactor.java (renamed from src/main/java/container/GUIContainer_ModularNuclearReactor.java)3
-rw-r--r--src/main/java/client/gui/Gui_ItemProxyEndpoint.java (renamed from src/main/java/container/Gui_ItemProxyEndpoint.java)5
-rw-r--r--src/main/java/client/gui/Gui_ItemProxySource.java (renamed from src/main/java/container/Gui_ItemProxySource.java)3
-rw-r--r--src/main/java/client/renderer/ConduitRenderer.java93
-rw-r--r--src/main/java/client/renderer/TESR_SECapacitor.java74
-rw-r--r--src/main/java/client/renderer/TESR_SETether.java76
-rw-r--r--src/main/java/common/Blocks.java104
-rw-r--r--src/main/java/common/Recipes.java622
-rw-r--r--src/main/java/common/Researches.java60
-rw-r--r--src/main/java/common/blocks/BaseGTUpdateableBlock.java58
-rw-r--r--src/main/java/common/blocks/Block_ControlRod.java28
-rw-r--r--src/main/java/common/blocks/Block_GDCUnit.java28
-rw-r--r--src/main/java/common/blocks/Block_IchorJar.java222
-rw-r--r--src/main/java/common/blocks/Block_ItemProxyCable.java66
-rw-r--r--src/main/java/common/blocks/Block_ItemProxyEndpoint.java61
-rw-r--r--src/main/java/common/blocks/Block_ItemProxySource.java61
-rw-r--r--src/main/java/common/blocks/Block_ItemServerDrive.java (renamed from src/main/java/blocks/Block_ItemServerDrive.java)25
-rw-r--r--src/main/java/common/blocks/Block_ItemServerIOPort.java43
-rw-r--r--src/main/java/common/blocks/Block_ItemServerRackCasing.java30
-rw-r--r--src/main/java/common/blocks/Block_LapotronicEnergyUnit.java93
-rw-r--r--src/main/java/common/blocks/Block_ReactorChamber_OFF.java (renamed from src/main/java/blocks/Block_ReactorChamber_OFF.java)24
-rw-r--r--src/main/java/common/blocks/Block_ReactorChamber_ON.java (renamed from src/main/java/blocks/Block_ReactorChamber_ON.java)24
-rw-r--r--src/main/java/common/blocks/Block_SpaceElevator.java61
-rw-r--r--src/main/java/common/blocks/Block_SpaceElevatorCapacitor.java80
-rw-r--r--src/main/java/common/blocks/Block_SpaceElevatorTether.java70
-rw-r--r--src/main/java/common/blocks/Block_TFFTCasing.java28
-rw-r--r--src/main/java/common/blocks/Block_TFFTMultiHatch.java65
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java38
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java37
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java37
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java37
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java37
-rw-r--r--src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java244
-rw-r--r--src/main/java/common/blocks/Block_YSZUnit.java28
-rw-r--r--src/main/java/common/container/Container_ItemProxyEndpoint.java (renamed from src/main/java/container/Container_ItemProxyEndpoint.java)2
-rw-r--r--src/main/java/common/container/Container_ItemProxySource.java (renamed from src/main/java/container/Container_ItemProxySource.java)2
-rw-r--r--src/main/java/common/container/Container_ModularNuclearReactor.java (renamed from src/main/java/container/Container_ModularNuclearReactor.java)