aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
AgeCommit message (Collapse)Author
2018-09-08fix name spacesDream-Master
2018-09-08fix derp. Will add drops laterDream-Master
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-07add whole Organic branch to gt codeDream-Master
2018-09-07Revert "add 9 slot assembler till iv thanks to spartak"Dream-Master
This reverts commit 1a5dfa592e2cb951d1fd6ca9314facc6d852ebb3.
2018-09-07Revert "fix nei gui derp"Dream-Master
This reverts commit 2e0f92449b5f63020becdb4ad8f320251cf9e243.
2018-09-07fix naquadah reactor wirednessDream-Master
2018-09-07fix nei gui derpDream-Master
2018-09-07add 9 slot assembler till iv thanks to spartakDream-Master
2018-09-06remove core mod hard dependenciesDream-Master
2018-09-06remove nq viDream-Master
2018-09-06fixed textDream-Master
2018-09-06remove unused stuff and rename fuelsDream-Master
2018-09-05Changed Nq Reactors to use the new Universal Classbartimaeusnek
2018-09-05Merge branch 'New_test_dev' of ↵bartimaeusnek
https://github.com/GTNewHorizons/GT5-Unofficial into New_test_dev
2018-09-05+added replacement class for ALL of the Nq Gen classes....bartimaeusnek
2018-09-05add back nq reactor tier uhvDream-Master
2018-09-05added back nq reactor for uhv ask 0lafe for infos :)Dream-Master
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-05Revert "remove nq generator from item list"Dream-Master
This reverts commit 848b2050d4f045a6cd6e109be1640b1a1ba63d0c.
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-05remobe nq generator from tile entity listDream-MasterXXL
2018-09-05remove nq generator from item listDream-MasterXXL
2018-09-05remove Nq reactor.Dream-MasterXXL
@draknyte please add my new fuel to your multiblock. Thanks
2018-09-05Merge branch 'experimental' into New_hightier_stuff_devMartin Robertz
2018-09-04Fix weirdness if only one of the gt6 pipes/cables are enabledJason Mitchell
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-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-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.
generated by cgit (git 2.46.0) at 2025-03-06 21:03:28 +0000