aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
AgeCommit message (Expand)Author
2018-10-05move materialsDream-Master
2018-10-05put materials to extra mateiralsDream-Master
2018-10-05Pyrotheum and Cryotheum beesDream-Master
2018-10-05try for force unification of assembler recipesbartimaeusnek
2018-10-05remove not working spaghetti codeDream-Master
2018-10-02Merge pull request #152 from Zoko061602/GT_Bees_devMartin Robertz
2018-10-02fixDream-Master
2018-10-01Fixed Iron III Chloride FormulaDaniel
2018-09-30fix errorDream-Master
2018-09-30add circuit assembler recipes alsoDream-Master
2018-09-30oredict circuits working now hopfullyDream-Master
2018-09-22Add the last com recipesDream-Master
2018-09-20Merge branch 'experimental' into GT_Bees_devDream-Master
2018-09-16Work with subclassed GT cables (ie: gt++ cables)Jason Mitchell
2018-09-14Merge branch 'experimental' into GT_Bees_devDream-Master
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-09Only connect on the server side.Jason Mitchell
2018-09-09handle nullsJason Mitchell
2018-09-08GC Energy CompatJason Mitchell
2018-09-08Various fixesbartimaeusnek
2018-09-07Revert "add 9 slot assembler till iv thanks to spartak"Dream-Master
2018-09-07Revert "fix nei gui derp"Dream-Master
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 nq viDream-Master
2018-09-05Merge remote-tracking branch 'origin/pipe_overhaul_and_fluidfilter_fix' into ...Dream-Master
2018-09-05Revert "remove Nq reactor."Dream-Master
2018-09-05Revert "remove nq generator from item list"Dream-Master
2018-09-05Merge branch 'New_hightier_stuff_dev' into New_test_devDream-Master
2018-09-05Merge branch 'New_hightier_stuff_dev' into New_test_devDream-Master
2018-09-05remove nq generator from item listDream-MasterXXL
2018-09-05remove Nq reactor.Dream-MasterXXL
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 o...Jason Mitchell
2018-09-03Pipe/Cable overhaul & Add filter output on fluid filtersJason Mitchell
2018-09-02derp fixDream-Master
2018-09-02spell fixesDream-Master
2018-09-02add more circuitsDream-Master
2018-09-02add new circuitDream-Master
2018-09-02fix superconductor wire color to white backDream-Master
2018-09-02add a second Material list with unused materialsDream-Master
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
2018-09-01rename all from wires to Superconductore uhvDream-Master