aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2017-05-13Added a new recipe map for the LCR, expanded the API to allow for customJohannes Gäßler
NEI stack positioning. Refactored the name of the Large Boiler Fake Fuels so they're in line with other names. Fixed a bug where the LCM was checking for the wrong casing type.
2017-05-13I prefer Power output texture for it.Technus
2017-05-13that makes it look better?Technus
2017-05-13Why does one change the machine state TWICE in the same tick...Technus
2017-05-12enable old rubber recipe in the Alloy smelterDream-Master
2017-05-12Fix oreProcessingTechnus
2017-05-12Added crafting recipes for the LCHJohannes Gäßler
2017-05-12add a localizer to asslineDream-Master
2017-05-12move this to core ModDream-Master
2017-05-12Merge branch 'ChemistryUpdate' into LargeChemicalReactorJohannes Gäßler
Conflicts: src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-05-12Naquadah Reactors recipes in Core ModDream-Master
fix infinity = infinite
2017-05-12rounds and small spring recipe changed a bit.Dream-Master
2017-05-12Modular Armor recipes now in the coremodDream-Master
2017-05-12Modular Armor recipes changesDream-Master
2017-05-12changed recipe againDream-Master
2017-05-12Modular Armor recipes changesDream-Master
2017-05-12Powder barrel using Plate WoodDream-Master
2017-05-12To make Foils you need a Hammer and a Saw nowDream-Master
2017-05-12Fusion Casing 2 craftableDream-Master
2017-05-12remove Gt recipes for ic nukeDream-Master
changed Field Gen recipes a bit
2017-05-10Merge branch 'unstable' into mergeGTNHTechnus
2017-05-09Added new textures for the LCM, using them nowJohannes Gäßler
2017-05-09Missing Imports and typo fix in comment.Technus
2017-05-09Implemented checkRecipeJohannes Gäßler
2017-05-09Idk, might be betterDaniel
2017-05-09Cleanup and some commentaryDaniel
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-08Reverted an erroneous name change for nitration mixtureJohannes Gäßler
2017-05-08Deleted prints used for debuggingJohannes Gäßler
2017-05-08Implemented checkMachine for the LCR, added machine casingsJohannes Gäßler
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-07change Texture a bit(Good Circuit)Dream-Master
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-07Created a non-functional first draft for the Large chemical ReactorJohannes Gäßler
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-07Reverted erroneous previous commit.Johannes Gäßler
2017-05-06Expand low grav dimensionsTechnus
2017-05-06Minor cleanupTechnus
2017-05-06Created a first draft for the Large Chemical ReactorJohannes Gäßler