aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/GT_Mod.java
AgeCommit message (Collapse)Author
2018-06-19Attempt to fix for #3030. Checking in on branch and doing PR so it can be ↵Richard Hendricks
reverted easily.
2018-06-17Smp assembly-line books issures (#128)bartimaeusnek
2018-06-05Added option for disabling machinemetal tinting.Richard Hendricks
2018-05-09NEI fix for scannerbartimaeusnek
+ fixed typo (32 instead of 30eu/t at Prospection Data scan) + added Schematic scan NEI-recipe
2018-05-04Soften dreamcraft dependencyNamikon
2018-01-13Make pipes aware of translocators & tinker construct faucets so they can connectJason Mitchell
2018-01-13cherry pickAntifluxfield
Commit: fce9104d49920eadbaabc48e33bfcb39b5ae8340 [fce9104] Fix custom enchantment for materials
2017-12-26UpdateAntifluxfield
2017-12-26Config to disable placeholder "%material"Antifluxfield
2017-12-24Optimize imports an add molten cellsTechnus
2017-12-23Remove all 32 eu/t recipes and replace them with 30 eu/t recipes.Dream-Master
remove LV and MV Mass Fabricator because they have no function
2017-12-02cherry pickredmage17
Commit: eb7185ca85a967c18acca514cb43bc096e0fcdb6 [eb7185c] Merge pull request #1284 from redmage17/unstable Configed Machine Casings
2017-11-24Remove unnecessary tabsRichard Hendricks
2017-11-24Feature complete. Ready for testing in multiple dimensions.Richard Hendricks
2017-11-24First pass at chunkifying oreveinsRichard Hendricks
2017-11-22Merge pull request #53 from Antifluxfield/GTNH-GT6_styled_pipesMartin Robertz
GT6 styled pipes
2017-11-22cherry pickJohannesGaessler
Commit: b87a55800f2a140ce0ad74b9a951994d9fdba9f5 [b87a558] Removed NEI Large boiler fuel entry for Carbon Dust (#1295) Fixes #1285. Invalid Burn value on Carbon dust in NEI page for Large Boiler Fuels.
2017-11-13GT6 styled pipesAntifluxfield
2017-10-20Add small ores debug messagesRichard Hendricks
2017-10-19l10n improveAntifluxfield
2017-10-16Add variable to configure number of attempts before giving up, default to ↵Richard Hendricks
64. Set default orevein fill rate to 75%
2017-10-16Rebase to latest experimental headRichard Hendricks
2017-09-27try to fix old chemical recipes removeDream-Master
2017-09-27change extraction recipes from fruits to juiceDream-Master
2017-09-15Added debug prints for cleanroom issues.Richard Hendricks
2017-09-13Revert "cherry pick"Dream-Master
This reverts commit 493cce8427b46fd27c77e822297491acb9b42fe6.
2017-09-12cherry pickDream-Master
51a4389f7c78fd5581d3844e2b57c2bf8f45f0ed Hard remove ores that might be exploitable by MRF laser drill
2017-09-12Enable Ores in Marble and Basalt too. Update a few filesDream-Master
2017-09-12cherry pickDream-Master
ded594c86c701a0ff1f2282b4d6bff9cc7b1b9f6 c6d39f12fdf85edbeadc725e0b398fa70eb15bd0 Patched ME energy tunnel, now they can emit GT energy. #1200 https://github.com/Blood-Asp/GT5-Unofficial/pull/1200
2017-08-04add back dreamcraft as dependencieDream-Master
2017-08-04Remove the enforcement of dreamcraft as dependency (still needed in the ↵Technus
modpack tho, but good for debugging)
2017-08-01cherry pickDream-Master
Commit: d563a92dbc1d4d27ec53d399b86f659ded46c02d [d563a92] Moved Synthetic Rubber requirement: EV -> IV, made it more convenient Cable insulation works as it did before for EV cables. IV+ Cables can be insulated with only molten Silicone. Insulation now also works with whole Dusts at 4x the batch size.
2017-07-28cherry pickDream-Master
1763f60b3638286cfa7b0f17f6aff72e744c8a1d Added a config for the converion rate of Direct Smelting: 1 <-> 2/3
2017-07-16Ash rebalance #1159Johannes Gäßler
cherry pick 5a8da3da9002791e5800648243bcbf1b918e09e7 ffac667541b8962fe6b2df650b64fa3948ac4222 85a921eb84a886177d719486ae0a7fc143503bb8 184774c7f1dfed2ada2d7b804c145409d3c2e26d
2017-07-16fix derpDream-Master
2017-07-16cherry pickJohannes Gäßler
f7e33fd402e4212518485d5650e1c0ecaac82937 Capped the output multiplier of stone dust to 100%.
2017-07-16cherry pickJohannes Gäßler
3253175e5f29b0deff080f4225c974b0ca596c1d Rebalanced Stone Dust centrifugation
2017-07-07cherry pickDream-Master
a6046ddfad81dca9b1c63d5f171b9ccd137f7288 5d8bcb0af35e57da789fc6b2126cb6931c092c4a 7d074d985f1f24a12354ed1d605eba92620bbc03 Fixed inventory misalignment when updating 5.09.30 -> 5.09.31 #1135
2017-06-24cherry pickJohannes Gäßler
6f3d92f3fab34444e8a8cc32bee9f80efde0eaaf Added a config option for easier EV+ Cables
2017-06-24cherry pickJohannes Gäßler
c0c498fb8cec35d35cc5fd2b8524cd5510082a9b Added Bricked BF config, fixed Primitive BF class hierarchy Blast Furnace Recipes using Coal or Charcoal now yield Dark Ash instead of Ash.
2017-06-17Optimize importsTechnus
2017-06-17Cleaned up to GT_MachineRecipeLoaderTechnus
2017-06-17Changes reverting part1Technus
2017-06-17Remove todoDaniel
2017-06-15Merge branch 'experimental' into reMergeTechnus
# Conflicts: # build.properties # src/main/java/gregtech/api/enums/ItemList.java # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java # src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java # src/main/java/gregtech/common/GT_Proxy.java # src/main/java/gregtech/common/GT_RecipeAdder.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java # src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java # src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png # src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png
2017-06-15Merge branch 'unstable_BLOOD' into reMergeTechnus
# Conflicts: # build.properties # src/main/java/gregtech/GT_Mod.java # src/main/java/gregtech/api/enums/ItemList.java # src/main/java/gregtech/common/GT_Network.java # src/main/java/gregtech/common/GT_Proxy.java # src/main/java/gregtech/common/covers/GT_Cover_Arm.java # src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java # src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java # src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java # src/main/java/gregtech/common/covers/GT_Cover_Drain.java # src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java # src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java # src/main/java/gregtech/common/covers/GT_Cover_Pump.java # src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java # src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java # src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java # src/main/java/gregtech/common/covers/GT_Cover_Shutter.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java # src/main/java/gregtech/common/tools/GT_Tool.java # src/main/java/gregtech/common/tools/GT_Tool_Axe.java # src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java # src/main/java/gregtech/loaders/misc/GT_CoverLoader.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java # src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
2017-06-15Merge branch 'unstable_BLOOD' into reMergeTechnus
# Conflicts: # build.properties # src/main/java/gregtech/GT_Mod.java # src/main/java/gregtech/api/enums/Textures.java # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java # src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java # src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java # src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java # src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java # src/main/java/gregtech/api/metatileentity/MetaTileEntity.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java # src/main/java/gregtech/api/objects/GT_UO_DimensionList.java # src/main/java/gregtech/api/util/GT_Utility.java # src/main/java/gregtech/common/GT_Client.java # src/main/java/gregtech/common/GT_Pollution.java # src/main/java/gregtech/common/GT_Proxy.java # src/main/java/gregtech/common/GT_UndergroundOil.java # src/main/java/gregtech/common/GT_Worldgenerator.java # src/main/java/gregtech/common/blocks/GT_Block_Machines.java # src/main/java/gregtech/common/blocks/GT_Material_Casings.java # src/main/java/gregtech/common/covers/GT_Cover_Arm.java # src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java # src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java # src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java # src/main/java/gregtech/common/covers/GT_Cover_Drain.java # src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java # src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java # src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java # src/main/java/gregtech/common/covers/GT_Cover_Pump.java # src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java # src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java # src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java # src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java # src/main/java/gregtech/common/covers/GT_Cover_Shutter.java # src/main/java/gregtech/common/covers/GT_Cover_Vent.java # src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java # src/main/java/gregtech/common/gui/GT_Container_Filter.java # src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java # src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java # src/main/java/gregtech/common/items/behaviors/Behaviour_None.java # src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java # src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java # src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java # src/main/java/gregtech/loaders/load/GT_FuelLoader.java # src/main/java/gregtech/loaders/misc/GT_CoverLoader.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java # src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
2017-06-14cherry pickDraknyte1
d1eea59fe744c1b5b2c5dae324b6887f985a6569 Made the Cleanroom optional. This disables the Low Grav option if the Cleanroom is disabled.
2017-06-14Made the Cleanroom optional.Draknyte1
This disables the Low Grav option if the Cleanroom is disabled.
2017-06-13meh...Blood-Asp
generated by cgit (git 2.46.0) at 2025-03-06 20:59:23 +0000