aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-08-05Merge pull request #22 from D-Cysteine/masterMartin Robertz
Fix void miner in Ross Former-commit-id: d92a95c5c4a16a38b36206e801a12f946b5abe44
2021-08-04Fix Ross void minerD-Cysteine
Former-commit-id: 1efa09636673739423ea8e667fe0096e7eb30ee6
2021-07-30Merge branch 'GTNewHorizons:master' into masterD-Cysteine
Former-commit-id: 4f390b00778811eb36c55c9f6b8f914e25105f13
2021-07-30Merge pull request #21 from GTNewHorizons/patch-build-scriptMartin Robertz
Use experimental branch since it's merged Former-commit-id: fc5666cf404f3494ae1113376f704c56cbb53385
2021-07-30Use experimental branch since it's mergedGlease
Former-commit-id: dea0d9300df04dc3e5fa22a53adbe1e70b923e31
2021-07-30Merge branch 'GTNewHorizons:master' into masterD-Cysteine
Former-commit-id: 1f727df05b256a8fd99126f588bb59429c54e4c2
2021-07-30Delete TT_PyrolyseOven.javaD-Cysteine
Fix merge conflict Former-commit-id: a2d7e02649610fc0c2c30dc480e4aa2b83ee30a6
2021-07-30Merge pull request #15 from GTNewHorizons/structurelib-integrationMartin Robertz
adjust multiblocks to work with structurelib Former-commit-id: a177f8d31c1a9767abfc0ae3146ced3c488a7bd4
2021-07-29Merge branch 'GTNewHorizons:master' into masterD-Cysteine
Former-commit-id: 6b7001687fb81a7673bdd0b786f643956370df7f
2021-07-29Merge pull request #20 from D-Cysteine/fix-molten-cellsMartin Robertz
Fix wrong recipe in MoltenCellLoader Former-commit-id: cd0a935f44535770db03cb7c8e88866749be0d2d
2021-07-29Fix wrong recipe in MoltenCellLoaderD-Cysteine
Former-commit-id: 8bbfe75ad384f68a025cc8f9a0e84e66415d7f0b
2021-07-29Delete no longer needed dynamic pyrolyse recipe codeD-Cysteine
Former-commit-id: b84e31e09e2c4340884f5a518f8ff21d15e43a39
2021-07-27adjust multiblocks to work with structurelibGlease
Former-commit-id: a0f63ca13bdfec42f849ced647d0146d76c3b735
2021-07-21Merge pull request #18 from GTNewHorizons/reserve-werkstoff-idMartin Robertz
reserve werkstoff id Former-commit-id: 2a078e6b6fbccd26a66666bb8e6fb09bbc63754e
2021-07-21 reserve werkstoff idGlodBlock
Former-commit-id: f003dc953322e0185852ee0b9f2fe6d43979b36c
2021-07-18Merge pull request #17 from boubou19/masterboubou19
removed output bus limitation on the CAL Former-commit-id: bb083fa3831a9a6c38db162993b4c77e33270de9
2021-07-18readd input limitation to avoid players using only the first input busboubou_19
Former-commit-id: 4d29e7b45b916e4f771042856e1ca5de5c66f09d
2021-07-18removed bus limitation on the CALboubou_19
Former-commit-id: 1a82db4ce0edbaa2cfd500156009cfe1d4042080
2021-07-17Merge pull request #16 from boubou19/masterMartin Robertz
fix void miner drops in the twilight forest Former-commit-id: 55c0bc34b06c5a6b0d6735aeb3a62114b7b79ae5
2021-07-17fix void miner drops in the twilight forestboubou_19
Former-commit-id: eff10776ce76b21b7c7a56b7bd040a41150866e0
2021-07-05Merge pull request #14 from GTNH-Afx237v7/masterMartin Robertz
Fix typos Former-commit-id: ee7e255a8c9dce71c32299db98e91d839ff26a46
2021-07-04Merge pull request #13 from Prometheus0000/cheeseMartin Robertz
Former-commit-id: 995710916500ffb4f2b363744faa2c2e3003d55a
2021-07-04Fix biso/triso typoGTNH-Afx237v7
Former-commit-id: 199cfddc6dd59fc4b0a44ca66527a17492a61c52
2021-07-04Merge branch 'GTNewHorizons:master' into masterGTNH-Afx237v7
Former-commit-id: d151100a8dc427ec4063c9be4e7521fecd12249c
2021-07-03Get rid of BW cheesePrometheus0000
Former-commit-id: 18c864a71235c44113203a6eb684e80a8653d078
2021-07-03Merge pull request #12 from GTNewHorizons/patch-localized-nameMartin Robertz
Do not overwrite localized name with default name Former-commit-id: 9dc19ce706dc170aed46e8344e509da3237d7391
2021-07-01Do not overwrite localized name with default nameGlease
Former-commit-id: 7bf016c002e77d175b9241fce0410e02548494d5
2021-06-27add(Bartworks)ChangelogDreamMasterXXL
update gitignore Former-commit-id: 3c8d027fcd9ffbfb4ced5b184ce9004eae261b21
2021-06-27Fix THTR controller textGTNH-Afx237v7
Former-commit-id: 94a3c47d8c56131035698bae534dfeca0eada382
2021-06-26Merge pull request #11 from boubou19/masterMartin Robertz
fixed another coil mistake in the MBF Former-commit-id: 2efb0851d2b2fc6ce43c0f5e9002e63f0b91bfca
2021-06-26fixed another coil mistake in the MBFboubou_19
Former-commit-id: ab7a336f43305b98d697f80afd8e0e264be0e8db
2021-06-24Merge pull request #10 from boubou19/masterMartin Robertz
fix MBF heat issues with new coils Former-commit-id: 962d4f7e64d7b324d6c56cfa83888d3d899642a7
2021-06-24fix MBF heat issues with new coilsboubou_19
Former-commit-id: a41b407e3942e86b97ac4ce0aa5e8c8a81f1c206
2021-06-20Merge pull request #9 from GTNewHorizons/cal-oc-fixMartin Robertz
Re-add CAL perfect overclock Former-commit-id: c1e5e3440c4835a054ef70ecd0206439814eb4b0
2021-06-21re-add perfect overclock to CALllk89
Former-commit-id: d6d63f227d9ff922f428a8cf3ba4f8aa0116278c
2021-06-15bump versionDreamMasterXXL
Former-commit-id: 152dc750847a41537d020dc8455017f6fe07cdf6
2021-05-25feat(textures): migrate to TextureFactory API and glow textures (#8)Léa Gris
- Migrate to the new implementation-free TextureFactory API. - Implement support for glow textures. Former-commit-id: f0d639281d732b70ce96ec0b71e868fad3021aa1
2021-05-23Merge pull request #7 from GTNewHorizons/fix_deprecated_CASING_BLOCKSMartin Robertz
fix(texture): multiblock addressing deprecated array Former-commit-id: 9ea670fcdf0e17e5d9ef9eae07412a94821c1d54
2021-05-22fix(texture): multiblock addressing deprecated arrayLéa Gris
replaces deprecated CASING_BLOCKS by getCasingTextureForId Former-commit-id: e73a81d26196dfadbec42479a7dfc242843ec3f5
2021-05-19Merge pull request #4 from GTNewHorizons/not-break-crackerMartin Robertz
unbreak cracker structure Former-commit-id: 52eadb7bf8204c08006b42911429cbb41fbbd410
2021-05-17Merge pull request #6 from GTNH-Afx237v7/masterMartin Robertz
fix MBF controller typo Former-commit-id: 7168bde9444d7508a1057d587adec0d2880be8a9
2021-05-17Merge pull request #5 from GTNewHorizons/patch-implosion-compressorEthryan
prevent resetPiston when machine not formed Former-commit-id: c2d13544019343f7b36a6045196aaca21d8622b0
2021-05-17fix MBF controller typoGTNH-Afx237v7
see https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/6912 Former-commit-id: 89d62e95241be1adebd7777a71fef14b44fe5177
2021-05-17Fix buildscriptGlease
Former-commit-id: 4f00ff7aad492e0d58873938ff876dd5f4e53d5d
2021-05-17prevent resetPiston when machine not formedGlease
Former-commit-id: 144be54de3e331d919f3ce11a783cf6b86070e27
2021-05-16bump versionDreamMasterXXL
Former-commit-id: ec7ba8367e8f31ed11b3aaa6149ad104dedefafc
2021-05-16Revert "bump version"DreamMasterXXL
This reverts commit c93ce2e9a40b8af87ffbd42ef3f41af11a20daa2 [formerly df9db0a3127dbe2cb0fe4d3209bdff625c192b13]. Former-commit-id: a8511ed77919a3e5359b89f12b35545bcb3b9b70
2021-05-16bump versionDreamMasterXXL
Former-commit-id: df9db0a3127dbe2cb0fe4d3209bdff625c192b13
2021-04-16allwo for more recipes in the oilcracker (#128)botn365
* allow for more difrent recipes allows for more difrent recipes while still keeping hydrogen and steam in the middle * remove extra space (cherry picked from commit c571afe43017cb0dbe5c6321ccce835d4c3e2f3d [formerly fe0e0357b681d0a7bc0a5be9f26de2b34c5b3f33]) Former-commit-id: 561056cf2d345c04ca78ee5016dad0b019ea8e58
2021-03-12Removed old dependency annotationbartimaeusnek
(cherry picked from commit 6ae8b900c872195d1e7134b66c2799a66bdbfc9e [formerly d8109a84906b2ce8e3969d3bc89d4a6e8e3ee74c]) Former-commit-id: eb00e7c09a0ba36911f0d954238a0cc824285421