aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2017-06-01Catch login armor crashBlood-Asp
2017-06-01Make internal RS reciever work as machine controller coverBlood-Asp
2017-05-30Fixed a bug where the LCM could have a mMaxProgressTime of zero.Johannes Gäßler
2017-05-29Make the error more descriptiveTechnus
2017-05-29Reduce casing requirementTechnus
2017-05-29Rework Heat Exchanger for 10x boostTechnus
2017-05-28fixed derpsDream-Master
2017-05-28removed empty shape plateDream-Master
2017-05-28added new molds for Stick, round, long stick, ring, bolt, screwDream-Master
2017-05-28If logWood it is ok.Technus
2017-05-28Change print methodTechnus
2017-05-28Add debug codeTechnus
2017-05-28Add Meta ID check to charcoal pile igniterTechnus
2017-05-28Enable Natura Wood for Pile IgniterDream-Master
2017-05-22fixed recipe derp in the chemical reactorDream-Master
Add rutile to the Polymerizations recipes Super Conducter Wire have to be lossless
2017-05-22some fixesDream-Master
2017-05-21Revert "chemical reactor test"Dream-Master
This reverts commit 614c29ef4659f0e885e3894d98f51d121ad3348d.
2017-05-21chemical reactor testDream-Master
2017-05-20Fixed Salt Water and Distillery circuit settings 1Dream-Master
Add Tube Wire Item for automate Tubes
2017-05-20Merge branch 'ChemistryUpdate' into mergeGTNHJohannes Gäßler
Conflicts: src/main/java/gregtech/GT_Mod.java src/main/java/gregtech/api/enums/ItemList.java src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java src/main/java/gregtech/api/util/GT_Recipe.java src/main/java/gregtech/common/GT_Proxy.java src/main/java/gregtech/common/GT_RecipeAdder.java src/main/java/gregtech/common/blocks/GT_Block_Casings2.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-05-15Add low grav to proc array, - assuming that proc array is always considered ↵Technus
in a clean room, added circuit assembler to proc array
2017-05-13Changed the Layout of the LCM to 3x3x3, tweaked the name of casings andJohannes Gäßler
the descriptions of multiblocks to make them consistent.
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-12Added crafting recipes for the LCHJohannes Gäßler
2017-05-12Merge branch 'ChemistryUpdate' into LargeChemicalReactorJohannes Gäßler
Conflicts: src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-05-12Powder barrel using Plate WoodDream-Master
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-09Cleanup and some commentaryDaniel
2017-05-09Add backwards compatibilityDaniel
2017-05-09Fix that so pollution is not negative.Daniel
2017-05-08Deleted prints used for debuggingJohannes Gäßler
2017-05-08Implemented checkMachine for the LCR, added machine casingsJohannes Gäßler
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-07this code is obsolete because shows double recipes in nei.Dream-Master
change recipes like it was before. Ring and Stick processing
2017-05-07maybe this worksDream-Master
2017-05-07Created a non-functional first draft for the Large chemical ReactorJohannes Gäßler
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-07Reverted erroneous previous commit.Johannes Gäßler
2017-05-06Minor cleanupTechnus
2017-05-06Created a first draft for the Large Chemical ReactorJohannes Gäßler
2017-05-06Fixed the Electric Blast Furnace not recognizing recipes when there isJohannes Gäßler
more than one Fluid input. Also added a String representation for GT_FluidStack that was used for debugging.
2017-05-06Remove compiletime dependency of CoreMod, Add runtime dependency of CoreModTechnus
+optimize imports +add ToDo for dream to migrate the recipes to coremod
generated by cgit (git 2.46.0) at 2025-03-06 22:07:06 +0000