aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
AgeCommit message (Collapse)Author
2017-05-09Add backwards compatibilityDaniel
2017-05-09Fix that so pollution is not negative.Daniel
2017-05-08Change time 16cable needsDream-Master
lower infinity ingots a bit zpm2
2017-05-07fic Gears and RingsDream-Master
bump version
2017-05-07Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial ↵Technus
into mergeGTNH # Conflicts: # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
2017-05-07another oil rewrite, even more BloodAsp likeTechnus
2017-05-07remove todoDream-Master
2017-05-07added small and large Spring Shaped craftingDream-Master
2017-05-07this code is obsolete because shows double recipes in nei.Dream-Master
change recipes like it was before. Ring and Stick processing
2017-05-07Solar Panels to Core ModDream-Master
2017-05-07maybe this worksDream-Master
2017-05-07remove GalliumArsenic recipe ingot alloying from ebfDream-Master
2017-05-07reverted it because not workingDream-Master
2017-05-07try to make it public because jenkins cant build itDream-Master
11:11:20 :compileJavawarning: /var/lib/jenkins/.gradle/caches/modules-2/files-2.1/magneticraft/0.6.1-final/f8b88d8a61499d4a9fd0b979f3d3945e8809623a/magneticraft-0.6.1-final.jar(com/cout970/magneticraft/api/access/MgRecipeRegister.class): major version 52 is newer than 51, the highest major version supported by this compiler. 11:11:20 It is recommended that the compiler be upgraded. 11:11:22 /var/lib/jenkins/workspace/Gregtech-5-Unofficial/build/sources/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java:156: error: Entry is not public in HashMap; cannot be accessed from outside package 11:11:22 for (HashMap.Entry<ChunkPosition, FluidStack> fl : tFluids.entrySet()) {
2017-05-07move circuit recipe to core modDream-Master
2017-05-06Expand low grav dimensionsTechnus
2017-05-06Minor cleanupTechnus
2017-05-06Remove compiletime dependency of CoreMod, Add runtime dependency of CoreModTechnus
+optimize imports +add ToDo for dream to migrate the recipes to coremod
2017-05-06Revert Dream's doings, re enable materialsTechnus
2017-05-06Enable materials if coremod is loadedTechnus
2017-05-06remove this material dependenciesDream-Master
2017-05-05remove enable or disable solar panel recipes because always enable. Move ↵Dream-Master
recipe to crafting recipe section
2017-05-05all Cable recipes changes doneDream-Master
processing ingots= nuggets fix remove gt solar recipes and put them into core mod
2017-05-05Added cableGT16 processingTechnus
2017-05-05Add gem upgrading recipesTechnus
2017-05-05Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial ↵Technus
into mergeGTNH
2017-05-05EBF 20000K disable auto genned recipe supportTechnus
2017-05-05recipe fixDream-Master
2017-05-05battery recipesDream-Master
2017-05-05more recipe nerfsDream-Master
circuits, wafer etc
2017-05-04more component recipe changesDream-Master
2017-05-02a few chip recipe changes, png changesDream-Master
2017-05-02more Board recipe and balancing changesDream-Master
2017-05-02fixed Board recipes a bitDream-Master
2017-05-02make things more easy and realisticDream-Master
2017-05-01more recipes changedDream-Master
2017-05-01added cutter and Chemical reactor to cleanroom (optional recipes)Dream-Master
a few recipe changes
2017-05-01more advanced circuit Board changesDream-Master
2017-05-01new Etched wire recipesDream-Master
2017-05-01Added back Etched wiresDream-Master
Added new Bords
2017-05-01Not neededTechnus
2017-05-01Optimize importsTechnus
2017-05-01Not needed.Technus
2017-05-01Random text changes.Technus
2017-05-01Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial ↵Technus
into mergeGTNH
2017-05-01Oil and pollution overhaulTechnus
2017-05-01Added Advanced Fiber Glass BoardDream-Master
Few recipe changes
2017-04-30more high Tier circuit recipe changesDream-Master
2017-04-30second recipe for diodeDream-Master
2017-04-30fix recipe basic circuitDream-Master
machine recipe loader file was to large. I divided it again @Technus are this ok or did i derp here?