aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2018-09-14fix alloy branchDream-Master
2018-09-14update beesDream-Master
2018-09-14Merge branch 'experimental' into GT_Bees_devDream-Master
2018-09-14works ons beesDream-Master
2018-09-11merge @Zoko061602 changesDream-Master
Thanks
2018-09-11Added more Thaumic beesDream-MasterXXL
2018-09-10Fix cachingJason Mitchell
2018-09-10Proper import for Objects.Richard Hendricks
2018-09-10Trying Alkalus fix, compile problem with hashCode.Richard Hendricks
2018-09-10added all alloy bees and combs. centrifuge recipes missingDream-Master
2018-09-10Merge branch 'experimental' into GT_Bees_devDream-Master
2018-09-09Only connect on the server side.Jason Mitchell
2018-09-09Merge branch 'experimental' of ↵Dream-Master
https://github.com/GTNewHorizons/GT5-Unofficial into GT_Bees_dev
2018-09-09handle nullsJason Mitchell
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-08fixed bees be even with gendustryDream-Master
2018-09-08change string to byteDream-Master
2018-09-08fix bee comps and add localizersDream-Master
2018-09-08Merge branch 'GT_Bees_dev' of ↵Dream-Master
https://github.com/GTNewHorizons/GT5-Unofficial into GT_Bees_dev
2018-09-08test zokos patchDream-Master
2018-09-08Fixed spelling errorDaniel
2018-09-08fix batty beeDream-Master
2018-09-08fixed BATTY beeDream-Master
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