aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
AgeCommit message (Collapse)Author
2021-09-13Change mass calculation to match gregtech waykuba6000
Former-commit-id: 3eda8c976662f213eeb4bee572c21a0eee09de0e
2021-09-09Fix git derpGlease
Former-commit-id: 2249373213d577cac51706fad0a54eda4600359f
2021-09-09Fix importGlease
Former-commit-id: 0be4a8f33bb63b498a92df124b980ce80d0b0028
2021-09-09Make bridge materials properly load localizationsGlease
Former-commit-id: 27b2106504524392a07b0a2ae3085124e6968324
2021-09-06Merge pull request #34 from GTNewHorizons/structlib_ICustomBlockSetting_supportMartin Robertz
Make BW_MetaGeneratedBlocks_Casing implement ICustomBlockSetting from both TecTech & Structlib Former-commit-id: d3c6cfb75c96cd00259773805953240737e9b936
2021-09-06Make BW_MetaGeneratedBlocks_Casing implement ICustomBlockSetting from both ↵Jason Mitchell
TecTech (Unclear if this is still used) & structlib Former-commit-id: cccc1f30487ad3b7120f63588456c6deb6e9dd2c
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-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-29Fix potential race condition on client sideGlease
Former-commit-id: 2616978ec4ca6bed7892afe0f135768801bb0a41
2021-08-15Add number formatting for recipe special valueD-Cysteine
Former-commit-id: e77b35fa3f37277fa08cd9d84eb8c888a49eb098
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-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-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-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-04Fix Ross void minerD-Cysteine
Former-commit-id: 1efa09636673739423ea8e667fe0096e7eb30ee6
2021-07-30Merge pull request #15 from GTNewHorizons/structurelib-integrationMartin Robertz
adjust multiblocks to work with structurelib Former-commit-id: a177f8d31c1a9767abfc0ae3146ced3c488a7bd4
2021-07-29Fix wrong recipe in MoltenCellLoaderD-Cysteine
Former-commit-id: 8bbfe75ad384f68a025cc8f9a0e84e66415d7f0b
2021-07-27adjust multiblocks to work with structurelibGlease
Former-commit-id: a0f63ca13bdfec42f849ced647d0146d76c3b735
2021-07-21 reserve werkstoff idGlodBlock
Former-commit-id: f003dc953322e0185852ee0b9f2fe6d43979b36c
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-17fix void miner drops in the twilight forestboubou_19
Former-commit-id: eff10776ce76b21b7c7a56b7bd040a41150866e0
2021-07-03Get rid of BW cheesePrometheus0000
Former-commit-id: 18c864a71235c44113203a6eb684e80a8653d078
2021-07-01Do not overwrite localized name with default nameGlease
Former-commit-id: 7bf016c002e77d175b9241fce0410e02548494d5
2021-06-26fixed another coil mistake in the MBFboubou_19
Former-commit-id: ab7a336f43305b98d697f80afd8e0e264be0e8db
2021-06-24fix MBF heat issues with new coilsboubou_19
Former-commit-id: a41b407e3942e86b97ac4ce0aa5e8c8a81f1c206
2021-06-21re-add perfect overclock to CALllk89
Former-commit-id: d6d63f227d9ff922f428a8cf3ba4f8aa0116278c
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-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-17prevent resetPiston when machine not formedGlease
Former-commit-id: 144be54de3e331d919f3ce11a783cf6b86070e27
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
2021-03-12Resolve Cyclic Dependancy with miscutilsbartimaeusnek
+ also made gradle wait for deps by default. (cherry picked from commit 79442ef9d74e6f73cd89ee19de1330f94be5fbe5 [formerly 059918559c472d2c1f17a0806916bc9543415ac9]) Former-commit-id: 3c549f350f8c81bc34b6ff5ca524965073143eb9
2021-03-03Added TGregworks integration (#126)bartimaeusnek
(cherry picked from commit e6f4a1453afece3e68c750684a225be415b40584 [formerly 44aa12c5de2f8e1487e5f5d140668ba559d31ab1]) Former-commit-id: 08379a6fa1c8961e288f6da614ba536d4af7af21
2021-03-03fixes Pyrolyse not checking topbartimaeusnek
(cherry picked from commit 528980859b910226a299dc1657e981a5fd112c50 [formerly e35ff1621be566d225c902d7941bb37f80b064bd]) Former-commit-id: 09e2a1617f88dce9e205a57f366800ca0fe3499e