aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-09-05Merge pull request #31 from GTNewHorizons/fix-dupeMartin Robertz
fix osmiridium dupe Former-commit-id: d24fca400ac3a77f3dced8852db83386c310e9ef
2021-09-05make it not uglyGlodBlock
Former-commit-id: cb5ef2c29ffc4966d3298b4522364c30165b5fce
2021-09-04Merge pull request #32 from GTNewHorizons/add-auto-mix-optionMartin Robertz
add integrated circuit to auto mix recipe Former-commit-id: 6d45a0e7bcfc774889f205924348fcbb107cc34f
2021-09-04Merge pull request #33 from GTNewHorizons/fix_masterMartin Robertz
Fix Master and remove Mega PA (Unused, deprecated, and broken due to upstream changes) Former-commit-id: 4b2017b0e7d26a744bea84fb1645f65aea6a1b7e
2021-09-04Fix Master and remove Mega PA (Unused, deprecated, and broken due to ↵Jason Mitchell
upstream changes) Former-commit-id: b6d0974c12a8b8f37d00a8bc043bc771e9c81f23
2021-09-02add an option to add integrated circuit to auto generated mix recipes. ↵GlodBlock
currently all auto generated mix recipes don't use the circuit, there is going be tons of recipe conflict when bw alloy become more. Former-commit-id: 2b806369abc68220c6ee8c004829e450bbe2d954
2021-08-29remove the deprecated mega PAGlodBlock
Former-commit-id: 23e597894b42390f1ab7cef33704729e41b33a74
2021-08-29fix osmiridium dupeGlodBlock
Former-commit-id: 066afd9389789638865f764545d5fcbb23e8bf3b
2021-08-29Merge pull request #30 from GTNewHorizons/fix-8468Martin Robertz
Fix potential race condition on client side Former-commit-id: 1dfb463e9486fb123c34debaf05fbff8bd2b47e2
2021-08-29Fix potential race condition on client sideGlease
Former-commit-id: 2616978ec4ca6bed7892afe0f135768801bb0a41
2021-08-17bump versionDreamMasterXXL
Former-commit-id: 1d2b02f716a95363f1ff35f30cbe3eca7ae90ac2
2021-08-16Merge pull request #28 from D-Cysteine/masterMartin Robertz
Add number formatting for recipe special value Former-commit-id: 2707bb809e373bd7ec27d3d664c5d27030f96c88
2021-08-15Add number formatting for recipe special valueD-Cysteine
Former-commit-id: e77b35fa3f37277fa08cd9d84eb8c888a49eb098
2021-08-15Merge pull request #27 from D-Cysteine/masterMartin Robertz
Update to latest Forestry API Former-commit-id: 4e669f6ba7c898047501eb98851833c9ee4501fb
2021-08-14Merge branch 'GTNewHorizons:master' into masterD-Cysteine
Former-commit-id: 79dac54afda9ced7a112215ada60fba50a42e930
2021-08-14Update to new Forestry APID-Cysteine
Former-commit-id: f8f4993de7b7ca8c24db1981f923e829ee99b5d2
2021-08-14Merge pull request #25 from GTNewHorizons/lang-file-cleanMartin Robertz
stop generating unused entries in GregTech.lang Former-commit-id: 427e66707bb7ce0658dce22bbe87b8c70126f313
2021-08-13Merge pull request #26 from GTNewHorizons/patch-mbf-tooltipMartin Robertz
Fix MBF structure tooltip Former-commit-id: 19d57eb04c551980468680cc5cb14f55f390c80d
2021-08-14Fix MBF structure tooltipGlease
Former-commit-id: ef046060480e9a087f9575b47834e5693265b393
2021-08-11default is enabledGlodBlock
Former-commit-id: 2dace120b5cebff5a59069c67bd5f9f373f05072
2021-08-11add config for block casingsGlodBlock
Former-commit-id: 1aba363d4499cf9cddc55640b24e78ed2dad074a
2021-08-11add another check for oredictGlodBlock
Former-commit-id: 934612d5628464733524eb0870d889eaff997978
2021-08-10stop it generating shit in GregTech.langGlodBlock
Former-commit-id: dd09c2b8efd59ee944c04b0008992eee16d48a23
2021-08-09Merge pull request #24 from D-Cysteine/format-numbersMartin Robertz
Add number formatting and fix array OOB Former-commit-id: aad7bbf246f138f558a7e49d419896eef8d1b627
2021-08-08Add formatting to getInfoData()D-Cysteine
Former-commit-id: 7a846b13949e026b7757b49406681d000e6f6c83
2021-08-08Handle tier out of boundsD-Cysteine
Former-commit-id: 82c6160b47472af821b83dc518442f90bbe4c365
2021-08-08Format numbers in tooltipsD-Cysteine
Former-commit-id: fd8e7ed0571e12f19755312f0240aa4827986b85
2021-08-08Merge pull request #23 from kuba6000/masterMartin Robertz
Fix void miner ore generation Former-commit-id: 953e06e849cd2d506ab7b1172329cdbd9e11615d
2021-08-08Change logickuba6000
Former-commit-id: 0b1528224ccf3921febe2d5b74df97538ba86a06
2021-08-08Fix server freeze when miner is placed in garden dim or any other dim ↵kuba6000
without ores & name changes Former-commit-id: 2f4afe6749189afebef3e646a52be48ed70ccd4e
2021-08-07Fix ross ores & generation chanceskuba6000
Fixes issue where ross planets have all ores from both of them & Fixes weight override when the same ore appears more than once Former-commit-id: a79536975a6362224cab0cb7844210550d2eb7ab
2021-08-06Remove commentskuba6000
Former-commit-id: 1062f70ea6f76f2fe2fbffdcbae8692f5cd0f7d4
2021-08-06Fix void miner ore generationkuba6000
Fix ores that are impossible to get because of their weight < 1 Former-commit-id: 3522bd46ed16293667c73626e16fd10f616fbe69
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