aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
AgeCommit message (Collapse)Author
2020-04-15Refactor to fixed thread pool executorTechnus
Use actually something made for this task...
2020-04-14crashfixbartimaeusnek
+ Added a new Thread every time a world is loaded Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-14shortened the codebartimaeusnek
+ by using toUpdate as sync object Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-14Made use of Thread.wait()bartimaeusnek
+ shortened "causeMachineUpdate" method Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-14Named the threadbartimaeusnek
+ actually use the right method (and not the old one lol) + Interrupted the Thread onServerAboutToStop Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-14Merge branch 'experimental' into experimentalMogballThreadingbartimaeusnek
2020-04-14Tried to make Mogballs Optimisation properly threadedbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-13Revert "Use HashSet for machine block update and limit recursion depth"Martin Robertz
2020-04-13remove recursion depth limit and nullcheck on instanceofMogball
2020-04-12Review commentsMogball
2020-04-12Fix non GT tileentities should still propagateMogball
2020-04-12Use HashSet for machine block update and limit recursion depthMogball
2020-04-11Merge branch 'fixes2' into fixesDream-Master
# Conflicts: # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2020-04-11add additionl recipe changes to the fixDream-Master
2020-04-10Merge remote-tracking branch 'origin/fixes' into fixesbartimaeusnek
2020-04-10replaced magic numbers with string identifiersbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-10Merge branch 'experimental' into fixesbartimaeusnek
2020-04-10UHV fixesbartimaeusnek
+ updated tritanium color Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-10different fixesbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-10Void miner adjustments (#262)bartimaeusnek
* Added all Ores to Voidminer in DeepDark + removed Infinity Ore Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> * renormalize line endings Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-10renormalize line endingsbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-10Added all Ores to Voidminer in DeepDarkbartimaeusnek
+ removed Infinity Ore Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-10Removed T5 & T6 Minersbartimaeusnek
+ Added BW Compat for easier use of BW Materials in code + Removed DD Veins Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-09change oredrill recipes and oil drill recipesDream-Master
2020-04-09put all Oil and oredrill recipes to Assembler/asslineDream-Master
2020-04-07Merge branch 'Ore-Drilling-T5+T6' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into Ore-Drilling-T5+T6 # Conflicts: # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant5.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant6.java
2020-04-07Set textures and adjust casing block register rangeTechnus
2020-04-07change textur id of ore drillsDream-Master
2020-04-07Merge branch 'experimental' into Ore-Drilling-T5+T6Dream-Master
2020-04-07add missing printer backDream-Master
add missing ids to processing array
2020-04-06Added a better way for the Processing Array to handle recipes.Dream-Master
https://github.com/Blood-Asp/GT5-Unofficial/pull/1551 add missing Packer machines back
2020-04-06Move to proper id's out of GT++ space... but they are still unused on ↵Technus
hatches... so does not really matter... (cherry picked from commit 880f24355b6afbc860dc28a66c9f660f2b5610d8)
2020-04-06Move to proper id's out of GT++ space... but they are still unused on ↵Technus
hatches... so does not really matter...
2020-04-06Merge branch 'experimental' into Ore-Drilling-T5+T6Technus
# Conflicts: # src/main/java/gregtech/api/enums/Textures.java
2020-04-06Texture paging names should match...Technus
2020-04-06Texture paging implementedTechnus
2020-04-06Commented texture pagingTechnus
2020-04-06fix textureDream-Master
fix tier from ore drill tier 6 bump version
2020-04-06Merge branch 'experimental' into Ore-Drilling-T5+T6Dream-Master
2020-04-06change Melodic Alloy space in NameDream-Master
add Pink Slime to EBF and Vac add shapeless recipe for Clay Compound
2020-04-06change ender io materialDream-Master
add crafting recipes
2020-04-06change color of Crude steel and Pink slime a bitDream-Master
2020-04-06add more Ender IO material properties to material list.Dream-Master
2020-04-05Merge pull request #258 from moller21/experimentalMartin Robertz
Display fluid amount in the fluid display stack.
2020-04-05CrudeSteelDaniel
makes GTMaterial match up with EnderIO material
2020-04-05add new Enderi IO materials to GTJason Mitchell
2020-04-05Display fluid amount in the fluid display stack.moller21
2020-03-23no messageJason Mitchell
2020-03-23Fix replicator race condition (#255)Jason Mitchell
2020-03-23First attemp to add Ore drilling Plant Luv and ZPMDream-Master
generated by cgit (git 2.46.0) at 2025-03-04 21:20:52 +0000