aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2020-05-12buffed drilling area in chunk mode for it to be not smaller than in the ↵repo_alt
block mode fixed scanner info & tooltip https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/5836
2020-05-11Merge remote-tracking branch 'origin/experimental' into HEE-BeesDreamMasterXXL
2020-05-11Changed drilling plant tooltip to be more clear about drilling arearepo_alt
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/5836
2020-05-10finishing hee bees so farDreamMasterXXL
2020-05-10Merge branch 'experimental' into HEE-BeesDreamMasterXXL
2020-05-10add more hee beesDreamMasterXXL
2020-05-10more HEE bees and some fixesDreamMasterXXL
2020-05-10Fix/Nerf cleanroommoller21
2020-05-10Merge branch 'experimental' into HEE-BeesDreamMasterXXL
2020-05-10Start to add new HEE Bees for Ender Dust, Ectoplasma and Arcane ShardsDreamMasterXXL
2020-05-10Merge pull request #281 from moller21/coverguis2Martin Robertz
Cover GUI's take 2
2020-05-10Cover GUI: added fluid regulator, finished open on shiftrightclick.moller21
2020-05-06Cover gui: Right click to open instead take.2moller21
2020-05-053x3 pattern does not work in a packagerrepo_alt
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/6052
2020-05-05Merge pull request #279 from GTNewHorizons/DropBartApiMartin Robertz
Drop barts api
2020-05-04Drop barts apiTechnus
2020-05-04Added cover guis for pump/filtermoller21
2020-05-03Clean up the fluid display thing.moller21
2020-05-03Why it haff to be squaremoller21
2020-05-03Update GT_Cover_SolarPanel.javaDaniel
2020-04-24Merge pull request #269 from GTNewHorizons/ReplicatorNERFMartin Robertz
Nerfed replicator
2020-04-24Factor 1.2 for nowMartin Robertz
2020-04-24Merge pull request #272 from GTNewHorizons/clsMartin Robertz
Cls
2020-04-24Merge pull request #270 from GTNewHorizons/advanced-smd-chipsMartin Robertz
Advanced smd chips
2020-04-24fixed Adv. Seismic Prospector off-by-one errorrepo_alt
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/5588 simplified calculations some code cleanup
2020-04-22fix stainless steel naming in large cellsDreamMasterXXL
(cherry picked from commit f949a9063d6e00a931e827abf89db82795e9bfd8)
2020-04-19Refactored CLS support into an own Compatbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-19CLS not a dependency anymorejackowski626
Works through reflection now
2020-04-19Renamed Variables to be less misleadingbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-19Nerfed replicatorbartimaeusnek
+ added a config option + made TankSize of Replicator a bit nicer Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
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-19More Polybenzimidazole (PBI) Uses in Higher Tier Recipes #5928DreamMasterXXL
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/5928
2020-04-16disable threaded caching of mUpdate valuesTechnus
2020-04-10replaced magic numbers with string identifiersbartimaeusnek
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-10renormalize line endingsbartimaeusnek
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-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-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