aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2017-06-11Quick fixesBlood-Asp
2017-06-10Added a Recipe Map for Primitive Blast FurnacesJohannes Gäßler
The Recipe Map is not yet in use.
2017-06-09cherry pickJohannes Gäßler
74c41614a5e8a6cb49e62a225669a1e1d07bc87b
2017-06-08Implemented Bricked Blast Furnace, added corresponding texturesJohannes Gäßler
Added a new Casing for the Bricked Blast Furnace, GT_Block_Casings4, ID 15 Refactored the non-electric Blast Furnaces: The Bronze Blast Furnace and the Bricked Blast Furnace extend a superclass to ensure consistent behavior. Subclasses only differ in texture, description, and Casing Block.
2017-06-08fix wrong center chunk coordinatesTechlone
2017-06-07experimental worldgen change fixBlood-Asp
2017-06-07Merge branch 'unstable' into advminer2_improvementsTechlone
# Conflicts: # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
2017-06-07Merge branch 'advminer2_improvements' of ↵Techlone
https://github.com/Techlone/GT5-Unofficial into advminer2_improvements
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-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-06Oil Cracking Update from Johannes GaesslerDream-Master
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-05Improved large boiler tooltip #877Blood-Asp
2017-06-05Add missing translation lines. #772Blood-Asp
2017-06-05cherry pickDream-Master
e42ddd911a60fd58e1c5908b2206ad6afc1a9f96
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-05this actually changes the raytracer boxes reusing the collision boxesTechnus
2017-06-05fix OsmiridiumCasing recipe in AssemblerTechlone
fix ODP changing state when the tip meets itself fix cleaning of oreBlockPositions when a mining column was broken
2017-06-04Merge branch 'ChemistryUpdate' of ↵Johannes Gäßler
https://github.com/JohannesGaessler/GT5-Unofficial into ChemistryUpdate
2017-06-04Moved 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-04Merge branch 'unstable' into advminer2_improvementsTechlone
2017-06-04wire/pipe hiding/reduced sizeTechnus
2017-06-04Monocrystalline Silicon BouleBlood-Asp
2017-06-04Cleanroom outputs in redstone its cleannes/efficiency.Blood-Asp
2017-06-04Monocrystalline Silicon BouleBlood-Asp
2017-06-04Cleanroom controller outputs efficency as redstone signal #948Blood-Asp
2017-06-03Fix Pollution bugBlood-Asp
2017-06-031ddc91aTechnus
2017-06-03Fix Pollution bugBlood-Asp
2017-06-02Make Casings and reinforced blocks transfer redstone signalsBlood-Asp
cherry pick : b0049786b7d31efed3a54995d917335f0f8061c9
2017-06-02Some ODP fixes, energy checking, add radius in tooltip, add "missing pipes" ↵Techlone
message for II-IV tiers change build.gradle for debugging in IDEA
2017-06-02Make Casings and reinforced blocks transfer redstone signalsBlood-Asp
2017-06-01Fix comb processing recipes #1052Blood-Asp
2017-06-01Make multiblocks consider all fluid inputsJohannes Gäßler
2017-06-01Update GT_Cover_PlayerDetector.javaantifluxfield
2017-06-01Update GT_Cover_PlayerDetector.javaantifluxfield
2017-06-01Disable switching armor gui because of broken syncBlood-Asp
2017-06-01Catch login armor crashBlood-Asp
2017-06-01Make internal RS reciever work as machine controller coverBlood-Asp
2017-06-01Merge branch 'unstable' into advminer2_improvementsTechlone
2017-06-01OreDrill state savingTechlone
2017-06-01Fix OreDrill; fix getting block in ItemList; some changes in addInformation ↵Techlone
- need check this
2017-06-01Teleporter and Energy Transmitter fixesBlood-Asp
2017-06-01Cleanup and some commentaryDaniel