aboutsummaryrefslogtreecommitdiff
path: root/src/main
AgeCommit message (Collapse)Author
2020-06-12Revert "Revert "MachineBlock runnable toggle""DreamMasterXXL
This reverts commit c40ad6aecab563410ad68fde6e39bcc0e3121469.
2020-06-11Revert "MachineBlock runnable toggle"DreamMasterXXL
This reverts commit 8b93a2909d7285f6506a56889929039c41882845.
2020-06-11Phthalic Acid change breaks things #6242DreamMasterXXL
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/6242
2020-06-11Do shitDreamMasterXXL
2020-06-11Revert "Nitric Acid name wrong as a fluid #6231"DreamMasterXXL
This reverts commit 08263315da19202b519f40aeb6dc456c56d0f2fd.
2020-06-11Nitric Acid name wrong as a fluid #6231DreamMasterXXL
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/6231
2020-06-11Phtalic Acid name wrong #6232DreamMasterXXL
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/6232
2020-06-09Fixed NEI time value for Replicatorsbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-06-09MachineBlock runnable togglebartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-06-07change the tatalite mix to show up in neiDreamMasterXXL
2020-06-04Merge pull request #300 from moller21/cover_guisMartin Robertz
Cover guis
2020-06-03coverguis: Cleaned up text.moller21
2020-06-03Merge pull request #295 from GTNewHorizons/LargeChemOCMartin Robertz
Unified Large Chem reactor OC
2020-06-02Not for the arm either ...moller21
2020-06-02Should not break existing covers now.moller21
2020-06-01Check first, then commit next timemoller21
2020-06-01Added gui's for the rest of em covers.moller21
2020-05-31Centrifuging Rubber Wood only outputs Methane Gas #5243DreamMasterXXL
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/5243
2020-05-31Remove LoggingJason Mitchell
2020-05-31Only modify aStack when doDrain == trueJason Mitchell
2020-05-29A simple new vein for higher tiers (LuV+) for solving Niobium shortage at ↵DreamMasterXXL
these higher tiers #6142 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/6142 (cherry picked from commit 7e5714da86ed1c1734739c9991d0a1f6bcb7d2e2)
2020-05-29reduce amountDreamMasterXXL
(cherry picked from commit 98471aa4ee6d6288cefea330dc0b20065f7e5c59)
2020-05-29adjust mix a bitDreamMasterXXL
(cherry picked from commit 66f5179166a9cb1a5b0e1f9dfc3d07f463f6f96a)
2020-05-29A simple new vein for higher tiers (LuV+) for solving Niobium shortage at ↵DreamMasterXXL
these higher tiers #6142 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/6142 (cherry picked from commit 632d51f63ac8cd6157809dfa3590a9cf78aa90f9)
2020-05-29add Borosilicate Glass recipe for petri dishDreamMasterXXL
(cherry picked from commit 090483a1f5931676425845177350d80fdb8b2e6f)
2020-05-27Update GT_VolumetricFlask.javaAlkalus
Fixed missing annotation, prevents crashing Server Side if class is accessed reflectively.
2020-05-27Unified Large Chem reactor OCbartimaeusnek
related #294 Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-05-26Update GT_VolumetricFlask.javaAlkalus
Made Flask icon handling more flexible.
2020-05-24Update zh_CN.lang[Kiwi233]
2020-05-22Merge branch 'experimental' into beesDreamMasterXXL
2020-05-22Update GT_MetaTileEntity_Cleanroom.javaMartin Robertz
2020-05-16fix recipe map autoclaveDreamMasterXXL
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-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 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-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