aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-29add Borosilicate Glass recipe for petri dishDreamMasterXXL
(cherry picked from commit 090483a1f5931676425845177350d80fdb8b2e6f)
2020-05-29bump versionDreamMasterXXL
(cherry picked from commit ee7acb9bfa805f07c14a315f0959e9dec2f5696e)
2020-05-27Merge pull request #296 from GTNewHorizons/draknyte1-patch-1Martin Robertz
Update GT_VolumetricFlask.java
2020-05-27Update GT_VolumetricFlask.javaAlkalus
Fixed missing annotation, prevents crashing Server Side if class is accessed reflectively.
2020-05-26Merge pull request #293 from GTNewHorizons/draknyte1-patch-1Martin Robertz
Update GT_VolumetricFlask.java
2020-05-26Update GT_VolumetricFlask.javaAlkalus
Made Flask icon handling more flexible.
2020-05-25bump versionDreamMasterXXL
2020-05-24Merge pull request #291 from Kiwi233/experimentalMartin Robertz
Update zh_CN.lang
2020-05-24Update zh_CN.lang[Kiwi233]
2020-05-24Merge pull request #1 from GTNewHorizons/experimentalKiwi
5/24
2020-05-22Merge pull request #289 from GTNewHorizons/beesMartin Robertz
Bees
2020-05-22Merge branch 'experimental' into beesDreamMasterXXL
2020-05-22Merge pull request #288 from GTNewHorizons/Dream-Master-patch-1bartimaeusnek
Update GT_MetaTileEntity_Cleanroom.java
2020-05-22Update GT_MetaTileEntity_Cleanroom.javaMartin Robertz
2020-05-16fix recipe map autoclaveDreamMasterXXL
2020-05-16bump versionDreamMasterXXL
2020-05-16fix low gravity recipesDreamMasterXXL
2020-05-16adding missing autoclave comb recipesDreamMasterXXL
2020-05-16update autoclaveDreamMasterXXL
2020-05-16Add new Autoclave TextureDreamMasterXXL
2020-05-16bee changesDreamMasterXXL
Autoclave get a new input slot
2020-05-16Merge pull request #287 from GTNewHorizons/recipe_cache_debugMartin Robertz
Debug recipe errors
2020-05-16Debug recipe errorsJason Mitchell
2020-05-16fix bugsDreamMasterXXL
Naquadria combs give naquadah ore #6120 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/6120
2020-05-15Naquadria combs give naquadah ore #6120DreamMasterXXL
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/6120 (cherry picked from commit a3dbffc92ebf8b89a24e29339cf9064ce7437b70)
2020-05-14Merge pull request #285 from GTNewHorizons/HEE-BeesMartin Robertz
Hee bees
2020-05-14Merge branch 'experimental' into HEE-BeesDreamMasterXXL
2020-05-13Merge pull request #286 from GTNewHorizons/fluidRendererFixMartin Robertz
FluidRenderer Fixes
2020-05-13FluidRenderer Fixesbartimaeusnek
+ Made GT_FluidDisplayItem.getIconFromDamage NEVER return null + Made GT_FluidDisplayStackRenderer reset its OpenGL calls before returning Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-05-13clean up versionDreamMasterXXL
2020-05-13set hidden bees now to hidden. Before it wont workDreamMasterXXL
2020-05-13Add Fire Essense beeDreamMasterXXL
2020-05-12Merge branch 'experimental' into HEE-BeesDreamMasterXXL
2020-05-12Merge pull request #284 from repo-alt/experimentalMartin Robertz
buffed drilling area in chunk mode for it to be not smaller than in t…
2020-05-12fix a few thingsDreamMasterXXL
2020-05-12Refactored drilling area center to be in the corner of the chunk, so that ↵repo_alt
miner would be digging whole number of standard 3x3 veins (if placed properly)
2020-05-12fix spawner egg from combsDreamMasterXXL
2020-05-12Merge branch 'experimental' into HEE-BeesDreamMasterXXL
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-12Fixed NPE during Worldgenbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-05-11Merge remote-tracking branch 'origin/experimental' into HEE-BeesDreamMasterXXL
2020-05-11Merge pull request #283 from repo-alt/experimentalMartin Robertz
Changed drilling plant tooltip to be more clear about drilling area
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-10fix overseenDreamMasterXXL
2020-05-10Merge branch 'experimental' into HEE-BeesDreamMasterXXL
2020-05-10add more hee beesDreamMasterXXL
2020-05-10Merge pull request #282 from moller21/CleanroomMartin Robertz
Fix/Nerf cleanroom
2020-05-10more HEE bees and some fixesDreamMasterXXL
2020-05-10Fix/Nerf cleanroommoller21