aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
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-05Merge branch 'New_hightier_stuff_dev' into New_test_devDream-Master
# Conflicts: # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2018-09-05remove Nq reactor.Dream-MasterXXL
@draknyte please add my new fuel to your multiblock. Thanks
2018-09-03* Fix: Colored cables/pipes properly connect (or don't) to each other based ↵Jason Mitchell
on color * Trigger connection evaluation on painting of cables/pipes or machines * Trigger connection evaluation on placement of blocks -- IE: A wire/pipe open to air, and then a dirt block is placed on it - this will close the pipe/wire connection
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-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 solar panelsDream-Master
2018-09-01remove naq reactor uev and uivDream-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-31add reinforced Glass tubesDream-Master
add recipes for it
2018-08-31More Bio Circuit partsDream-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-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-29fluid regulater adjustment is broken #3535Dream-Master
2018-08-21fixed GT Teleporterbartimaeusnek
+ improofed readability a bit (in dependencies in GT_Mod & GT_MetaTileEntity_Teleporter) - removed unused libs
2018-08-19cherry pickAlkalus
Fixed Mufflers and Large Boiler Fuels. (#1319) 92bcce8fd50004abc898cdd3464942b9a98d24a9 https://github.com/Blood-Asp/GT5-Unofficial/commit/92bcce8fd50004abc898cdd3464942b9a98d24a9
2018-08-15Added powderbarrels to usage. Added recipes to make Adv Seismic Prospectors. ↵Richard Hendricks
Removed recipes for the old ones.
2018-08-15Do radius in blocks. Clean up printouts. Add in chunk information for ↵Richard Hendricks
located ores.
2018-08-15fix radiusRichard Hendricks
2018-08-15Prep for changesRichard Hendricks
2018-08-13Fix for issue 3399.Richard Hendricks
2018-08-11Alternative Primitive Circuits for MV #3438Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/3438
2018-08-05Increase Large Combustion Engine pollution 50%.Richard Hendricks
2018-08-02cleanroom not working in LV #3355Dream-MasterXXL
https://github.com/GTNewHorizons/NewHorizons/issues/3355
2018-08-01cleanroom not working in LV #3355Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/3355
2018-08-01cleanroom not working in LV #3355Dream-MasterXXL
https://github.com/GTNewHorizons/NewHorizons/issues/3355
2018-07-21Revert changes for machine metal support, using different method now via ↵Richard Hendricks
coremod to enable disable.
2018-07-14Look for air instead of tile.air. Fixes ↵Jason Mitchell
https://github.com/GTNewHorizons/NewHorizons/issues/3308
2018-07-14reverted Blood-Asp#1468 due to buggy behavior with ore grindingbartimaeusnek
2018-07-07Update tooltipsJason Mitchell
2018-07-07Whoops, guess GT++ uses the default constructor... so add that back in :-DJason Mitchell
2018-07-07Configurable max stacks for conveyorsJason Mitchell
2018-06-30added some Main Branch PRsbartimaeusnek
https://github.com/Blood-Asp/GT5-Unofficial/pull/1468/ https://github.com/Blood-Asp/GT5-Unofficial/pull/1462 https://github.com/Blood-Asp/GT5-Unofficial/pull/1452/
2018-06-30Merge pull request #133 from GTNewHorizons/small_ores_into_codebartimaeusnek
pulled small ores into code
2018-06-30fixes #3226 viabartimaeusnek
execution of https://github.com/Blood-Asp/GT5-Unofficial/pull/1384 and
2018-06-30pulled small ores into codebartimaeusnek
-removed config for custom ores -removed immensive engineering support -removed magneticraft support -removed PFAAGeologica support +added small ores for GaGreg +version bump
2018-06-21Make Fluid Filters cheaper #2448Dream-Master
Why there was two recipes ?
2018-06-20New feature for chestbuffers/superbuffers:Transfer size mode. Instead of ↵Richard Hendricks
matching the output inventory, this mode will only transfer fixed sizes to output invetory. Useful for input hatches to Amazon Packager or PA filled with packagers.
2018-06-18Merge branch 'experimental' into scanner_fixesbartimaeusnek
2018-06-18fix for #2152bartimaeusnek
fix for reused DataSticks keep parts of old NBTTagCompound fixed blockores and removed one hashmap
2018-06-17Smp assembly-line books issures (#128)bartimaeusnek
2018-06-16fixed Multiple items on one pagebartimaeusnek
2018-06-16fixed SMP Assembly Line book issures.bartimaeusnek