aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2017-06-29Add missing importTechnus
2017-06-29Fix a bug where the bricked blast furnace didnt need casingJohannes Gäßler
2017-06-25spellingDream-Master
2017-06-25fix spellingDream-Master
2017-06-25Revert "Fixed recipes robot arm and Sensors using wrong circuits"Dream-Master
This reverts commit 87b88798669c934416df08096377a7a075cf59e9.
2017-06-25Fixed recipes robot arm and Sensors using wrong circuitsDream-Master
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-23Add new Circuit PartsDream-Master
2017-06-22cherry pickJohannes Gäßler
14b9332d141ff652cf728ea16a7d44274f0e1bef Moved the Casings for the Large Chemical Reactor again. As it turns out overwriting Casings 4.4 and 4.5 was not a good idea because even though there is no actual Casing at those IDs, the textures are in use. I started a new batch of Casings (GT_Block_Casings8) at IDs 112-127. I did not use IDs 80-95 because there seem to already be some textures there. I did not use IDs 96-111 because they seem to already be in use by Technus.
2017-06-19Merge remote-tracking branch 'Petrochemy/BrickedBlastFurnace' into ↵Dream-Master
BrickedBlastFurnace
2017-06-19Minor change, full revert.Technus
2017-06-18Revert worldgen changes.Technus
2017-06-17Implemented crafting recipes for the Bricked Blast FurnaceJohannes Gäßler
fixed Glass Hammering consuming 40x more energy than intended Fixed Hammer recipes that (presumably unintentionally) had 10EUt, 16 ticks instead of 16EUt, 10 ticks. Renamed Dense Bricks -> Firebricks
2017-06-17Optimize importsTechnus
2017-06-17Merge branch 'unstable_BLOOD' into reMergeTechnus
# Conflicts: # src/main/java/gregtech/api/enums/ItemList.java # src/main/java/gregtech/api/enums/Textures.java # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-17Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into ↵Blood-Asp
unstable
2017-06-17Extended logging for AssemblylineBlood-Asp
2017-06-17Merge pull request #1074 from Techlone/advminer2_improvementsBlood-Asp
AdvMiner2 renamed; new tiers of OreDrillingPlant
2017-06-17Cleaned up to ore processingTechnus
2017-06-17Changes reverting part1Technus
2017-06-17Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' intoJohannes Gäßler
BrickedBlastFurnace Conflicts: src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/api/enums/Textures.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-16Adjusted BBF GUIs to accommodate to the new 3/3 layout.Johannes Gäßler
2017-06-16Added Interface classes for the BBF, increased slots to 3/3Johannes Gäßler
2017-06-16Things cleanupTechnus
2017-06-16Merge branch 'unstable_BLOOD' into reMergeTechnus
# Conflicts: # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2017-06-15Fix hiding of unused ores. #1062Blood-Asp
2017-06-15Fix to runnable stateTechnus
2017-06-15Fix to buildable stateTechnus
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-15Merge remote-tracking branch 'origin/unstable' into ChemistryUpdateJohannes Gäßler
Conflicts: src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java src/main/java/gregtech/loaders/load/GT_FuelLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
2017-06-15Improve fog density calculationBlood-Asp
2017-06-15cherrypickBlood-Asp
911a80752930d6207fc0b850f3ccf8b3da05b0a5 pollution smog
2017-06-15Improve fog density calculationBlood-Asp
2017-06-14pollution smogBlood-Asp
2017-06-14cherry pickDream-Master
91fb725a472f8a832e47809d904d51c1ba61985e Fixed a bug where an Assembler recipe would be added if the output is null
2017-06-14cherry pickDraknyte1
d1eea59fe744c1b5b2c5dae324b6887f985a6569 Made the Cleanroom optional. This disables the Low Grav option if the Cleanroom is disabled.
2017-06-14cherry pickBlood-Asp
96b1cb31ced61270a1289da6da4cdd99f75eeb3a improve cleanroom tooltip
2017-06-14make reinforced blocks prevent monsterspawnsBlood-Asp
2017-06-14Merge branch 'Oil-Refinery-update' into experimentalDream-Master
2017-06-14Revert "Quick fixes"Dream-Master
This reverts commit 4a08587c07dd9c0f2a6bc783d7e8108a85438fd6.
2017-06-14cherry pickDream-Master
1b753d3528c7a149c23838eb3c4ce0d8f55036a6 Reworking DataOrb and DataStick
2017-06-14cherry pickTechlone
156bb2b06b942f35efa6719c856a9911b1f9f62e Tooltips changing
2017-06-14Made the Cleanroom optional.Draknyte1
This disables the Low Grav option if the Cleanroom is disabled.
2017-06-14improve cleanroom tooltipBlood-Asp
2017-06-14fix for timber changesBlood-Asp
2017-06-14make reinforced blocks prevent monsterspawnsBlood-Asp
2017-06-13wood plank compressor recipe #1013Blood-Asp
generated by cgit (git 2.46.0) at 2025-03-06 21:56:20 +0000