aboutsummaryrefslogtreecommitdiff
path: root/src/main
AgeCommit message (Collapse)Author
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-11Quick fixesBlood-Asp
2017-06-08fix wrong center chunk coordinatesTechlone
2017-06-07experimental worldgen change fixBlood-Asp
2017-06-07Quick fixesBlood-Asp
2017-06-07Merge branch 'refs/heads/pr/1077' into unstableBlood-Asp
# Conflicts: # src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
2017-06-07Merge pull request #1076 from vlad20012/int-overflow-fixBlood-Asp
Fixed stored energy integer overflow
2017-06-06forgot to commit the oredict changesBlood-Asp
2017-06-06Porting of GT6 prospection + Marble/Basalt compatibility, more oredicts for ↵Blood-Asp
marble/basalt, chisel compat #1050
2017-06-06Check general redstoneoutput for nullBlood-Asp
2017-06-06Fix Nitric Acid name #1079Blood-Asp
2017-06-06Correcting Steel Boiler Tooltip #1080Blood-Asp
2017-06-06cherry pick: from TechloneDream-Master
7cb51ae461815bfd767aa0bf64f8ff075de5624d c5402ee38998cc086ceb36fbce6c54aba6d9d79c 7c48590a49242bb26eddafa26d2cd7b4ce3546d8 75a33be210cda273ef9e6cc9cbbf739dd913907e b187410005771f1762f3bb5c94c0c5cd26dd06db
2017-06-06Fix vents as covers. Ventcovers now speed up machines 1-3% #1065Blood-Asp
2017-06-05Attempt to prevent worldgen loops with other mods #1063 #828Blood-Asp
2017-06-05fix typoDream-Master
Pyrolyse oven quest consumes pieces #1455 https://github.com/GTNewHorizons/NewHorizons/issues/1455
2017-06-05try this idDream-Master
2017-06-05Improved large boiler tooltip #877Blood-Asp
2017-06-05because this id was used by the core mod.Dream-Master
2017-06-05Add missing translation lines. #772Blood-Asp
2017-06-05cherry pickDream-Master
e42ddd911a60fd58e1c5908b2206ad6afc1a9f96
2017-06-05cherry pick:Johannes Gäßler
3ec9ddf34613b819a13e8cab8c84fcff369f1e65 Changed the MetaGeneratedItem ID of the Large Chem Reactor: 1177 -> 1200
2017-06-05Moved the casing IDs for the Large Chemical Reactor: 14, 15 -> 4, 5Johannes Gäßler
Limited the minimal recipe time for the LCM to 2 ticks to avoid bugs.
2017-06-05Thiccness changes doneTechnus
2017-06-05Adjust Thiccnes for things from bloodasp branchTechnus
2017-06-05Adjust pipe thiccnesTechnus
2017-06-05this actually changes the raytracer boxes reusing the collision boxesTechnus
2017-06-05Missing in item pipeTechnus
2017-06-04More redstone changesBlood-Asp
2017-06-04fix integer overflowTechnus
2017-06-04wire/pipe hiding/reduced sizeTechnus
2017-06-04Missing overrideTechnus
2017-06-04Monocrystalline Silicon BouleBlood-Asp
2017-06-04Missing override addedTechnus
2017-06-04Cleanroom outputs in redstone its cleannes/efficiency.Blood-Asp
2017-06-04Fixed stored energy integer overflowvlad20012
2017-06-04Monocrystalline Silicon BouleBlood-Asp
2017-06-04Cleanroom controller outputs efficency as redstone signal #948Blood-Asp
2017-06-03fixed compressed platesDream-Master
2017-06-03Fix Pollution bugBlood-Asp
2017-06-03no messageDream-Master
2017-06-031ddc91aTechnus
2017-06-03Fix Pollution bugBlood-Asp
2017-06-03new fusin reactor textureDream-Master
2017-06-02Make Casings and reinforced blocks transfer redstone signalsBlood-Asp
cherry pick : b0049786b7d31efed3a54995d917335f0f8061c9
2017-06-02Fix compressed meteoric iron recipe. #1071Blood-Asp
cherry pick : e3b3fd66f19d076fa841ad1da0e05bbb6605f4e3
2017-06-02Make Casings and reinforced blocks transfer redstone signalsBlood-Asp
2017-06-02Fix compressed meteoric iron recipe. #1071Blood-Asp
2017-06-01Fix comb processing recipes #1052Blood-Asp
2017-06-01fix #1041Blood-Asp
generated by cgit (git 2.46.0) at 2025-03-06 14:05:13 +0000