aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2018-09-05Merge branch 'New_hightier_stuff_dev' into New_test_devDream-Master
# Conflicts: # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2018-09-03Pipe/Cable overhaul & Add filter output on fluid filtersJason Mitchell
* Unified connect() method for pipes/wires - each subclass has it's own canConnect(), letsIn(), and letsOut() methods that map to the specifics for that implementation * Shift Clicking while placing a GT machine will now try connecting to the cable/pipe it is placed on * You can open a connection to the air for pipes & wires, allowing the next thing you place down to auto connect (ie: a JABBA barrel) * Distribute Fluids - Modeled after several of the upstream PRs * Fluid regulators on pipes should stop spazzing out now * Fluid filter covers - Now work with filtering output BUG/TODO: * Spray paint doesn't seem to keep wires/pipes from connecting properly * Spray paint on wires/pipes should force a disconnection check
2018-09-02Change Prometium RecipeDaniel
2018-09-02fix cells for nq reactorDream-Master
2018-09-02derp fixDream-Master
2018-09-02spell fixesDream-Master
2018-09-02fix solar namingsDream-Master
2018-09-02change solar pannels to meta generated items 03Dream-Master
add ass line localizer for items
2018-09-02add more circuitsDream-Master
2018-09-02add new circuitDream-Master
2018-09-02working on new circuitsDream-Master
2018-09-02fix Block alloy glassDream-Master
2018-09-02fix solar panelsDream-Master
2018-09-02reduce solar cover texture to 16x16Dream-Master
2018-09-02fix superconductor wire color to white backDream-Master
2018-09-02fix recipeDream-Master
2018-09-02Fix SaltwaterСпартак
Huge thanks to @Frytes
2018-09-02add a second Material list with unused materialsDream-Master
@bartimaeusnek can you check it please.
2018-09-02Add recipe for PromethiumСпартак
2018-09-02Add recipe for PromethiumСпартак
2018-09-02test commit @bartimaeusnekDream-Master
2018-09-01remove unused materials because of Materials.java:27: error: code too largeDream-Master
2018-09-01Merge branch 'experimental' into High_tier_circuits_devDream-Master
2018-09-01Merge pull request #140 from GTNewHorizons/bartimaeusnek-fixesMartin Robertz
added config option to allow broken recipe map for debug purposes
2018-09-01rename all from wires to Superconductore uhvDream-Master
2018-09-01remove naq reactor uev and uivDream-Master
2018-09-01change to new fluids for nq reactors.Dream-Master
2018-08-31add 3 more naq reactor tiersDream-Master
2018-08-31Added new Solar Panels from UHV to UIV (no recipes yet)Dream-Master
2018-08-31correcting superconductorsDream-Master
add bio tier
2018-08-31add Crystal soc 2 recipeDream-Master
2018-08-31add reinforced Glass tubesDream-Master
add recipes for it
2018-08-31Merge branch 'experimental' into High_tier_circuits_devDream-Master
2018-08-31More Bio Circuit partsDream-Master
2018-08-31Correct name of Superconductor for UHVСпартак
2018-08-31add texturesDream-Master
2018-08-31Add more high tier circuit parts and boardsDream-Master
2018-08-31rename oil drill to oil/fluid/gas drillDream-Master
2018-08-31added config option to allow broken recipe map for debug purposesbartimaeusnek
2018-08-30Fixed Java exception when removing chunks from list.Richard Hendricks
2018-08-29Java does not handle integer division in the expected way when going ↵Richard Hendricks
negative. Have to use Math.floorDiv() instead.
2018-08-29Un-Nerf Liquid Air #3517Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/3517
2018-08-29Sunnarium fusion recipe #3534Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/3534
2018-08-29remove iron3chloride from fluid list because it is an material now. Same for ↵Dream-Master
Lifeessence
2018-08-29add texture liquidairDream-Master
2018-08-29possible fix on Crash - Fluid Registry Issues - 5.09.32.34 #3536Dream-Master
2018-08-29fluid regulater adjustment is broken #3535Dream-Master
2018-08-28Register LiquidAir, Ethane. Ethylene, Salt water as fluids.Richard Hendricks
2018-08-26Missing LCR recipe for CrO2 + O -> CrO3 #3510Dream-Master
2018-08-26Final version of Alkalus's type filter fix. #3367Richard Hendricks