aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2018-09-16rename dropsDream-Master
2018-09-16fix comb recipesDream-Master
2018-09-16Add more bee combsDream-Master
2018-09-16add more bee combs recipesDream-Master
2018-09-16work on comb recipesDream-Master
2018-09-15fix derpDream-Master
fix bugs
2018-09-15optimize importsDream-Master
2018-09-15Add Propolis and PollenDream-Master
optimize imports
2018-09-15Add Drops recipe and change ROCK to rock in flowers alleleDream-Master
2018-09-15fix derpDream-Master
2018-09-15Add drops to gtDream-Master
2018-09-15More Thaumic Bee worksDream-Master
2018-09-15fixed and change bee recipesDream-Master
2018-09-15replace whole bee template with the traits copied from branchDream-Master
2018-09-15more bee fixes and changesDream-Master
2018-09-11Added more Thaumic beesDream-MasterXXL
2018-09-10added all alloy bees and combs. centrifuge recipes missingDream-Master
2018-09-09Merge branch 'experimental' of ↵Dream-Master
https://github.com/GTNewHorizons/GT5-Unofficial into GT_Bees_dev
2018-09-08GC Energy CompatJason Mitchell
* GT cables now properly fill GalacticCraft machines with Energy IC2/AE2 Energy Compat * Updated IC2 & AE2 energy compatability * Added an option ic2EnergySourceCompat (default is on) to allow GT cables to pull energy directly from IC2 energy sources (nuclear reactors, MSFEs, etc) without the need for a transformer * Filling IC2/AE2 energy buffers will now send multiple amps if needed Misc * Use a set instead of an arraylist for transfer electricity; deprecated backwards compatiable method left in
2018-09-08Merge branch 'experimental' into GT_Bees_devDream-Master
2018-09-08added tooltip for glassbartimaeusnek
+cleaned up code a bit
2018-09-08add ic2 line to codeDream-Master
2018-09-08Various fixesbartimaeusnek
+Added GT-FML-Log +Added an Exception if a Nq reactor without recipe map is created +Added the ability to add ReinforcedGlass in the CleanroomWalls (https://github.com/GTNewHorizons/NewHorizons/issues/3584) +Added a config option for changing the ReinforcedGlass percentage +Renamed Materials2 -> GTNH_ExtraMaterials and fixed it
2018-09-07change the process to lvDream-Master
will add more tiers
2018-09-07organic comb types merge from gendustryDream-Master
2018-09-07fix naquadah reactor wirednessDream-Master
2018-09-06remove nq viDream-Master
2018-09-06remove unused stuff and rename fuelsDream-Master
2018-09-05+added replacement class for ALL of the Nq Gen classes....bartimaeusnek
2018-09-05Merge remote-tracking branch 'origin/pipe_overhaul_and_fluidfilter_fix' into ↵Dream-Master
New_test_dev
2018-09-05Revert "remove Nq reactor."Dream-Master
This reverts commit 2364a365608f23a08cf46b10e1c36835fc66219d.
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