aboutsummaryrefslogtreecommitdiff
path: root/src/main
AgeCommit message (Collapse)Author
2021-01-24Merge branch 'experimental' of ↵repo_alt
https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2021-01-21Make sure the onServerTick event is actually called.Jason Mitchell
2021-01-19ME output busrepo_alt
2021-01-19Merge pull request #414 from ↵Martin Robertz
GTNewHorizons/maybe_fix_cme_in_machine_update_thread Do some locking around getTileEntity to avoid CMEs on the main thread
2021-01-18add comment as to onServerTick vs onWorldTickJason Mitchell
2021-01-18try/finallyJason Mitchell
2021-01-18Hashmap insteadJason Mitchell
2021-01-18Less silly getBurnTime()Jason Mitchell
2021-01-18Include getBlock and getBlockMetadata in the lockJason Mitchell
2021-01-18fix(GT)Lv Conveyourbelt recipeDreamMasterXXL
change Siicon rubber to Tin https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/5896
2021-01-18Do some locking around getTileEntity to avoid CMEs on the main threadJason Mitchell
2021-01-18Merge branch 'experimental' into mitchej123_cleanupMartin Robertz
2021-01-18Merge pull request #410 from albus12138/fix_multiblock_tooltip_errorMartin Robertz
Fix multiblock machine tooltip error
2021-01-18Replace tab with 4 spacesr4phael
2021-01-18Merge pull request #411 from GTNewHorizons/remove_modular_armorMartin Robertz
Debloat - Remove Modular Armor (It's buggy and not in use anyway)
2021-01-17More removal of commented out code, small formatting adjustmentsJason Mitchell
2021-01-17More removal of commented out code, small formatting adjustmentsJason Mitchell
2021-01-17More removal of commented out code, small formatting adjustmentsJason Mitchell
2021-01-17More removal of commented out code, small formatting adjustmentsJason Mitchell
2021-01-17More removal of commented out code, small formatting adjustmentsJason Mitchell
2021-01-17More removal of commented out code, small formatting adjustmentsJason Mitchell
2021-01-17More removal of commented out code, small formatting adjustmentsJason Mitchell
2021-01-17More removal of commented out code, small formatting adjustmentsJason Mitchell
2021-01-17Remove a bunch of commented out code, small formatting adjustmentsJason Mitchell
2021-01-17Optionally hide assline recipes (defaults to false). Should have no impact ↵Jason Mitchell
on the ability to craft them.
2021-01-18Remove additional method in IDescribabler4phael
2021-01-17Remove assetsJason Mitchell
2021-01-17Debloat - Remove Modular Armor (It's buggy and not in use anyway)Jason Mitchell
2021-01-17Fix multiblock machine tooltip errorr4phael
2021-01-17Merge pull request #408 from GTNewHorizons/fix_crash_in_speedupMartin Robertz
Fix crash with speedup
2021-01-17Fix cleanroom power usageGlease
2021-01-16Better fix.Jason Mitchell
Should be isStringValid(), not isStackValid()
2021-01-16Fix crash with speedupJason Mitchell
Not entirely sure why, but this causes a crash when registering modular armor because it can't find the ic2 good circuit...
2021-01-17Merge pull request #407 from GTNewHorizons/speeding-upMartin Robertz
Speeding up
2021-01-17Changed removing part with O(n) instead of O(n^2)TimeConqueror
2021-01-17One more changes to immutableTimeConqueror
2021-01-17Added immutable version of getOres method, which is faster due to not using ↵TimeConqueror
#addAll
2021-01-17Fix chest buffer and super buffer tooltip saying it consumes powerGlease
Left over of @eb2f20e5ed7e9c0d572928bb57a99d3f47c8fb11 Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-01-16cleanroom related fix (#405)Glease
* Fix cleanroom Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * Fix cleanroom tooltip not mentioning diodes count limit Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-01-16fix(GT)Alumite GT ToolsDreamMasterXXL
2021-01-13Fixes MagnesiumchlorideEthryan
2021-01-11Update en_US.langElisis
Fix a whole slew of typos and general inaccuracies
2021-01-09fix entity.gregtech.GT_Entity_Arrow.name localizationboubou19
2021-01-09remove(IC2)Electric Tools recipesDreamMasterXXL
2021-01-08Merge pull request #394 from GTNewHorizons/infinty-chest-compatibiletyMartin Robertz
infinity chest compatibiltey
2021-01-08Merge pull request #396 from GTNewHorizons/disable-filterMartin Robertz
Add option to disable input machine on single block machines
2021-01-08removed loggingDreamMasterXXL
2021-01-08Add option to disable input machine on single block machinesGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-01-07Merge pull request #397 from Prometheus0000/atextMartin Robertz
Add text for achievement
2021-01-07fixed item detector cover on quantum chests (#398)repo-alt
Co-authored-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>