aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
AgeCommit message (Collapse)Author
2020-03-22reverse commitDream-Master
(cherry picked from commit c759ae1b05589b411a603ffd2efa2c33b327540c)
2020-03-22reverse commitDream-Master
2020-03-22IC2 Charging Packs #5791Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/5791 (cherry picked from commit 76e8245d1c6f5a843eb04a6314f8b4ee75e45433)
2020-03-22IC2 Charging Packs #5791Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/5791
2020-03-22Merge remote-tracking branch 'origin/experimental' into Very-ExperimentalDream-Master
# Conflicts: # build.properties
2020-03-22refactored "static" Method (#253)bartimaeusnek
* refactored "static" Method + removed bugged enchantments on ichorium + added smite 8 for ichorium instead + refactored "initMaterialProperties" Method Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> * added in forgotten sub method Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> * forgot to add "1" to the string builder length
2020-03-21fixed https://github.com/GTNewHorizons/NewHorizons/issues/5787repo_alt
updated AE2 dependency to use rv3 API
2020-03-19Merge branch 'experimental' into Very-ExperimentalDream-Master
2020-03-19Merge pull request #251 from GTNewHorizons/RefactorMartin Robertz
Refactor
2020-03-19Add cover information on the machine item tooltip. (#252)Johnson
* Add cover information on the machine item tooltip.
2020-03-17Merge branch 'Refactor' into BeesDream-Master
2020-03-17reverted parallel stream changebartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored Interfacesbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_Slot_Holo.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_GUIContainerMetaTile_Machine.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_GUIContainer_MultiMachine.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_GUIContainer_BasicMachine.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_GUIContainer_2by2.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_ContainerMetaTile_Machine.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_Container_MaintenanceHatch.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_Container_BasicTank.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_Container_BasicMachine.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_Container.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored BlockScanningEvent.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored fixed 2 code smells in dyesbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored Materials.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored OrePrefixes.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored SubTag.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored TC_Aspects.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored Textures.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored TextureSet.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored Tier.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored MaterialBuilder.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored ItemList.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored GT_Values.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored Enchantment_EnderDamage.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored Element.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored GregTech_API.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-15Merge branch 'experimental' into BeesDream-Master
2020-03-15Merge pull request #194 from GTNewHorizons/lavaCentrifugeMartin Robertz
+adjusted Lava recipe to be more realistic
2020-03-15Merge branch 'experimental' into BeesDream-Master
2020-03-15Made ObjectCast explicitbartimaeusnek
For some reason intellij dropped this when pushing...
2020-03-15Refactored GT_MetaTileEntity_Replicator.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-15Refactored GT_Recipe.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-15Refactored GT_Mod.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-15add generate plates for marble and basaltDream-Master
2020-03-15try to add Basalt and Marble platesDream-Master
2020-03-12Revert "Revert "changing a bit bees allele""Dream-Master
This reverts commit 66ee3db890370b1a7843691eef2897931219cfb1.
2020-03-12chance tiny to smallbotn365
2020-03-12balance lava recipesbotn365
generated by cgit (git 2.46.0) at 2025-03-05 01:16:21 +0000