aboutsummaryrefslogtreecommitdiff
path: root/src/main
AgeCommit message (Collapse)Author
2020-04-19Refactored CLS support into an own Compatbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-19fixjackowski626
2020-04-19CLS not a dependency anymorejackowski626
Works through reflection now
2020-04-19Foxed Gradle and var declarationjackowski626
2020-04-19CLS supportjackowski626
OpenGL is a bit of a pita, wants only to be used in main thread. The easiest solution was to trigger CLS screen updates from GT. It is a soft dependency, if CLS isn't present, nothing breaks.
2020-04-19Revert "CLS support"jackowski626
This reverts commit 76c7090220f83008b157eb4ae9e1541c9ac6c1ee.
2020-04-19CLS supportjackowski626
OpenGL is a bit of a pita, wants only to be used in main thread. The easiest solution was to trigger CLS screen updates from GT. It is a soft dependency, if CLS isn't present, nothing breaks. Second pr because cloned fresh repo or else it attributed not my changes to me
2020-04-18remove unused materialsDreamMasterXXL
add gears to Cobalt and the Blue, Black and Red Steel (for the Oil Rig Recipes) fix spacing (cherry picked from commit 5bf8bb0089b2ff37e549f827d6e0aeac064fd87d)
2020-04-18Use ThreadLocalRandom for RNGMogball
2020-04-17Just in case?Technus
2020-04-17Add more logging to shutdownTechnus
2020-04-17Remove old commentTechnus
2020-04-17Shutdown properlyTechnus
2020-04-16disable threaded caching of mUpdate valuesTechnus
2020-04-15Merge branch 'experimentalMogballThreading' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into experimentalMogballThreading # Conflicts: # src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java
2020-04-15Refactor to fixed thread pool executorTechnus
Use actually something made for this task...
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-10remove archivents from ore drill V and VIDream-Master
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-09fix archivementDream-Master
ore drill 5 and 6
2020-04-09put all Oil and oredrill recipes to Assembler/asslineDream-Master
2020-04-07change Texture of the Ore drill casings a bitDream-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