aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-05-24Merge in GalacticGreg with historyRaven Szewczyk
git-subtree-dir: galacticgreg git-subtree-mainline: 7b534efabcc2f45031f29b197a3fa896e7166258 git-subtree-split: 38c18b5d591c557cab8fede6bf3a2a662dfdd4aa
2024-05-24Merge in bartworks with historyRaven Szewczyk
git-subtree-dir: bartworks git-subtree-mainline: 9b6fc0420059c6b399506cee841290766b72bd53 git-subtree-split: a3bc5e1404d24b1af784d165988baba682f660a5
2024-05-24Merge in GTplusplus with historyRaven Szewczyk
git-subtree-dir: gtpp git-subtree-mainline: 227856cdae4dae22fca53f2dc027cac476123bd0 git-subtree-split: 75915e9e1fce7a8ee500add139b42e806e9497b5
2024-05-24Add to ignore-revsRaven Szewczyk
2024-05-24Update to GT5u spotless configsRaven Szewczyk
2024-05-24Update buildscriptRaven Szewczyk
2024-05-24Add to ignore revsRaven Szewczyk
2024-05-24Apply updated GT5u spotless configsRaven Szewczyk
2024-05-24Add to ignore-revsRaven Szewczyk
2024-05-24Apply updated GT5 spotless configRaven Szewczyk
2024-05-23Multi Smelter & Ore Factory add batch mode & sub 1t oc (#2604)HoleFish
logic
2024-05-23Spotless ignore revsRaven Szewczyk
2024-05-23SpotlessRaven Szewczyk
2024-05-23GigaGramFab relocationRaven Szewczyk
2024-05-23Merge in GigaGramFab with historyRaven Szewczyk
git-subtree-dir: gigagramfab git-subtree-mainline: 5150fdf3b3d86c8405d15435f26a8515f92d7492 git-subtree-split: 64de1cb440a4ee5e8c3afa83c3c024f3355a018b
2024-05-23Update buildscriptRaven Szewczyk
2024-05-22Add RawOre items and processing (#879)Martin Robertz
* Add RawOre items and processing * Added textures * Change to a switch instead of elseif and add shouldFortune check Removed isNatural check since GT++ Ores aren't TileEntities * update * update * Fixed the controller texture for the turbines. * The file is not called anywhere? This file doesn't seem to be used anywhere. Maybe it's worth removing? * update * update * Update random code * fixed * Add Silk Touch * Update dependencies.gradle * Update dependencies.gradle --------- Co-authored-by: Ethryan <3237986+Ethryan@users.noreply.github.com> Co-authored-by: Pilad <piladt@gmail.com>
2024-05-22updateMartin Robertz
2024-05-22Add rawOre processing to PlatinumOverhaul and add ore drops (#10)Martin Robertz
* Add rawOre to PlatinumOverhaul * Implement rawores * update deps for use right version * update * Moved drops code and implement isNatural check. * update * Removed duplicate entry It gets it from super. * update * update * update * Update the Random code * fixed * Implement Silk Touch * Update dependencies.gradle --------- Co-authored-by: Ethryan <3237986+Ethryan@users.noreply.github.com>
2024-05-22updateMartin Robertz
2024-05-22Implementation: Raw Ore Items as Ore Drops (#2502)Ethryan
* testing * Fix textures * Adding Drops, still need to add furnace recipe * Need to fix the multiple smelting recipes. otherwise stuff works. * part 2 * Remove wip block code I added * Moved it to a new processing file * Fix Oredict and add a stone dust chance output. And added a config option for fortune bonus. * Finally got Spotless to work * fix config system set it in gregtech config with oredropbehaviour in gregtech.cfg * Added new option and an option that returns it to the old behaviour. * Moved the raw ores to meta3 since meta1 was full. (MetaID range fix) * Fixing the MBM to only process small ores with fortune. * New config option * try to fix the recipes not working on Zeta * Implement Caedis Fortune fix * Added comment * Spotless * Fix stone dust amount from macerator * Adding Raw ore to the OreFactory (Untested) * spotless * Update this to actually drop the amount number of stack, instead of the stack set to the amount * New Random function for fortune and shapeless crushing recipes for the raw ores. * Fix * Actually make the block per dimension. * Fix an () issue. And make this actually work ingame. and not just randomly. * Change back drops Ned to look into Silk Touch more * Enable Silk Touch * Wth Spotless?, THIS made you complain?
2024-05-22fix bismuth telluride naming (#13)NotAPenguin
2024-05-22Cleaning! (#881)Connor-Colenso
* Remove fluorite from sandstone references * Remove some unused content, rogue useless configs * Remove more junk * Remove more * Remove RF converter, I think this is disabled anyway? Or should be? * Opps missed this * Cleaning * Remove sick blaze, I can't even get this to spawn? The spawn egg also isn't in NEI? * Delete unused Australia textures * Unused texture loading * Bulk remove seemingly unused textures. * Remove xpjuice, seemingly no use? Change the localised name of mobessence to Mob Essence. Remove EnchantingUtils, no longer needed. * Clean * Unused tooltips * Remove hydrogen blob * Spotless apply for branch Cleaning! for #881 (#882) spotlessApply Co-authored-by: GitHub GTNH Actions <> * More cleaning * Lots of unused code. * Some reflection cleanup * Revert "Remove sick blaze, I can't even get this to spawn? The spawn egg also isn't in NEI?" This reverts commit d244b7dba00a9aee42b4a0596e842956acb36c5a. * Restore random conversion recipes * Unused texture * Unused stuff * Restore some missing textures * Spotless apply for branch Cleaning! for #881 (#883) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Conditionally enable xpjuice recipe on OpenBlocks loaded * Spotless apply for branch Cleaning! for #881 (#884) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-05-22Drone Center structure adjustments. (#2603)Abdiel Kavash
* Drone Center structure adjustments. * Center -> Middle, to not clash with machine name. * Revert "Center -> Middle, to not clash with machine name." Looks dumb, and "Center" is used in other controller tooltips.
2024-05-21Rocket engine pollution fix (#885)chochem
* fix pollution amount * slight code cleanup
2024-05-21fix drone centre not consuming drone from me input bus (#2602)Glease
2024-05-20updateMartin Robertz
2024-05-20Reducing allocation (#2601)Martin Robertz
* Add IAllSidedTexturedTileEntity to reduce memory overhead for ore textures (cherry picked from commit 274918800a3bf728e1db88e2d22b14cb6eb1a2e5) * Cache texture for ore, since it doesn't change during the game obviously (cherry picked from commit 45a2fe43f2cdb33fa7c0b05a4b8e4531fd2706a6) * Reduce allocations for inventory ores rendering (cherry picked from commit 5ed6526436e9b3a0586f37eac460f707636a102d) --------- Co-authored-by: SKProCH <skproch@yandex.ru>
2024-05-20updateMartin Robertz
2024-05-20no allocation (#12)HoleFish
2024-05-19updateMartin Robertz
2024-05-18Void Miner logic rework (#11)HoleFish
* update * rework * spotless * = -> copy
2024-05-18updateMartin Robertz
2024-05-18Fix far end asteroids generation (#2598)Oleg Ivanov
* Fix far end asteroids size * Use chunk seed to generate far end asteroids
2024-05-18backdate gt versionMartin Robertz
2024-05-18updateMartin Robertz
2024-05-17updateMartin Robertz
2024-05-17Make worldgen predicate more flexible (#2600)HoleFish
add method
2024-05-16Enable input bus separation for the MCR. (#9)Abdiel Kavash
* Enable input bus separation for the MCR. * Allow toggling by screwdriver.
2024-05-14updateMartin Robertz
2024-05-14Differentiate between DNA Sample Flask and Plasmid Sample Flask (#8)BlueHero233
2024-05-13Fix unwanted trailing commas from MCMETA (#2597)Julien Constant
This might be ignored by MC, but external JSON parser yells on this
2024-05-12updateMartin Robertz
2024-05-12Update GT_MetaTileEntity_IndustrialApiary.java (#2596)CromaMclos
The Apimancer's Drainer uses GT_MetaTileEntity_IndustrialApiary.getUsedQueen to retrieve the queen currently being processed by the Industrial Apiary. getUsedQueen is annotated with @SideOnly(Side.CLIENT) which only allows this function to be called from singleplayer. This function is not available when called from server-side and leads to the crash detailed in this issue. As far as I can tell, this function has no reason to be singleplayer / client-side only. This seems to be an artifact from when this function was imported over 2 years ago. Testing this change in our world prevents the crash and allows the Apimancer's Drainer to work as expected with the Industrial Apiary. Resolves GTNewHorizons/GT-New-Horizons-Modpack#16222
2024-05-11Change warning texts (#2592)HoleFish
change
2024-05-10updateMartin Robertz
2024-05-10Add textures for numbered bio and breakthrough circuits (#880)GDCloud
add numbers to bio and breakthrough circuits
2024-05-10updateMartin Robertz
2024-05-10Imporved Drone Center (#2591)RealSilverMoon
* Add plascrete block as an exception * Spotless * Add sort button * rebalance range * small fix * Add a localized button * Rename and add comment * Spotless
2024-05-10updateMartin Robertz