make "natural" decor blocks obtainable #1187
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…Providers for size to allow for min & max size.
…fier for stone blobs
…e texture as the normal block
stanieldev
approved these changes
May 3, 2024
screret
added a commit
that referenced
this pull request
May 4, 2024
* remove accidental accesswidener file * fix the damn treated wood textures. again. also add the windmill blocks. * run data * fix ignores * fix ignores, recipe IDs * remove now unused void ore values in GTOreDefinition, make it use IntProviders for size to allow for min & max size. * add stone blobs * fix? wood recipes * cap Z size to make cylinder a ball * fix some lang & other issues with the new wood things, add biome modifier for stone blobs * run datagen * remove "smooth" block type as it's unused and useless and has the same texture as the normal block * add red granite & marble ores
screret
added a commit
that referenced
this pull request
May 10, 2024
* remove accidental accesswidener file * fix the damn treated wood textures. again. also add the windmill blocks. * run data * fix ignores * fix ignores, recipe IDs * remove now unused void ore values in GTOreDefinition, make it use IntProviders for size to allow for min & max size. * add stone blobs * fix? wood recipes * cap Z size to make cylinder a ball * fix some lang & other issues with the new wood things, add biome modifier for stone blobs * run datagen * remove "smooth" block type as it's unused and useless and has the same texture as the normal block * add red granite & marble ores
screret
added a commit
that referenced
this pull request
May 10, 2024
* Update zh_cn.json (#1183) * Update for ru_ru lang file (#1188) * Translated using Weblate (Russian) Currently translated at 99.8% (5254 of 5261 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 100.0% (5261 of 5261 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 99.9% (5380 of 5384 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 100.0% (5384 of 5384 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ --------- Co-authored-by: Western01 <[email protected]> * make "natural" decor blocks obtainable (#1187) * remove accidental accesswidener file * fix the damn treated wood textures. again. also add the windmill blocks. * run data * fix ignores * fix ignores, recipe IDs * remove now unused void ore values in GTOreDefinition, make it use IntProviders for size to allow for min & max size. * add stone blobs * fix? wood recipes * cap Z size to make cylinder a ball * fix some lang & other issues with the new wood things, add biome modifier for stone blobs * run datagen * remove "smooth" block type as it's unused and useless and has the same texture as the normal block * add red granite & marble ores * boom booms (#1194) * add non-varargs `attachComponents` for single component additions * make casing blocks invalid for mob spawns * add ITNT, powderbarrel * move stone block loading to be above ores so that the game loads * run datagen * make explosion not drop everything twice, fix renderers * sync explosion to clients if on server, fix dynamite movement, remove exact copy of movement code from GTExplosiveEntity * reviews * ignore existing recipes (#1192) * make TagPrefix get the recipe provider in the generator method to clean up the recipe handlers * make MaterialRecipeHandler not add compression recipes for ignored materials * fix fluid locking (#1196) * Fix when autoBuild, reducing inventory even when block placement fails. (#1179) * fix a bug in cn.lang * fix: when autoBuild, reducing inventory even when block placement fails * change: Do not adjust facing of the blocks already placed * change: Do not adjust facing of the blocks already placed, part 2 * fix laser & optical pipes not dropping anything (#1197) * add back chest recipe replacement (#1198) * Update for ru_ru lang.file (#1199) * Translated using Weblate (Russian) Currently translated at 99.5% (5382 of 5405 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 99.7% (5394 of 5405 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ --------- Co-authored-by: Western01 <[email protected]> * fix KJS bedrock/fluid veins, cable transfer rate in scanner (#1200) * fix: setting the dimenson for bedrock ore and fluid veins in kjs * fix: display correct voltage for average cable transfer (port. scanner) * fix parallel issues (#1201) * remake parallel logic in hopes of it being faster this way * fix multi smelter not overclocking (fixes #1191) * move EU/t logic into EURecipeCapability, also check for tick inputs in ParallelLogic * fix OC display doing an overclock for ULV (#1202) * fix crash if can't parallel (oops,,,), steam machine parallel (#1203) * how'd it not commit these last time,,, (#1204) * fix crash if can't parallel (oops,,,), steam machine parallel * what the fuck how did it not commit these * fix raw ores being able to be smelted into ingots even with NO_SMELTING flag. (#1206) * fixed up treated wood sign creating lang for air (#1215) * fix sign rendering * Fix AveragingPerTickCounter.checkValueState (#1205) * fix chainsaw durability usage (#1218) * Fix mud recipe, use circuit 1 to distinguish it from fertilizer recipe (#1213) (cherry picked from commit d957b0a01e180430ae0bfe2cd4720cabc62da875) * move coil, filter & pss battery maps out of GTBlocks so addons have an easier time adding to them (#1224) * ARMORS (#1210) * remake: feat: start on armor system, netherite + echo stuff * holy shit armor again?!?!??! * more stuff:tm: * this should:tm: do * add manual models for fluids (hoping this'll make them all have the actual textures?) * add manual liquid fuel jetpack model (for fluid), rename all the armor models to match modern IDs * run datagen * fixes (holy shit it work) (gotta figure out what the /**/ commented code is doing) * fix keys being wack * fix armor damaging * fix armor protection display, durability/power bars * fix some other direct usages of ComponentItem instead of IComponentItem, fix jetpack movement * fix FluidRecipeHandler not reporting its tank count correctly * clean up unnecessary PowerlessJetpack code * fix PowerlessJetpack recipe matching not having an EU out at all * fix QuarkTech:tm: pants giving flight?? * fix uses of wrong container sync method * fix armor attribute modifier values * remove new materials (no uses lol) * fix some crashes (#1226) * fix prod crash * fix bedrock ore crash that sometimes happened * Fixes (#1207) * fix: update lang for portable scanner * fix: machine controller works with indirect redstone signal as well now * refactor: cleanup LargeTurbineMachine * chore: version and changelog * chore: remove unnecessary changelog entry * chore: changelog * fix errors part 1 * fix errors part 2 --------- Co-authored-by: iouter <[email protected]> Co-authored-by: marisathewitch <[email protected]> Co-authored-by: Western01 <[email protected]> Co-authored-by: MOYINGCrystal <[email protected]> Co-authored-by: Mikerooni <[email protected]> Co-authored-by: YoungOnion <[email protected]> Co-authored-by: richie3366 <[email protected]>
DimaKuzmin
pushed a commit
to DimaKuzmin/GregTech-Modern
that referenced
this pull request
Jun 1, 2024
* Update zh_cn.json (GregTechCEu#1183) * Update for ru_ru lang file (GregTechCEu#1188) * Translated using Weblate (Russian) Currently translated at 99.8% (5254 of 5261 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 100.0% (5261 of 5261 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 99.9% (5380 of 5384 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 100.0% (5384 of 5384 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ --------- Co-authored-by: Western01 <[email protected]> * make "natural" decor blocks obtainable (GregTechCEu#1187) * remove accidental accesswidener file * fix the damn treated wood textures. again. also add the windmill blocks. * run data * fix ignores * fix ignores, recipe IDs * remove now unused void ore values in GTOreDefinition, make it use IntProviders for size to allow for min & max size. * add stone blobs * fix? wood recipes * cap Z size to make cylinder a ball * fix some lang & other issues with the new wood things, add biome modifier for stone blobs * run datagen * remove "smooth" block type as it's unused and useless and has the same texture as the normal block * add red granite & marble ores * boom booms (GregTechCEu#1194) * add non-varargs `attachComponents` for single component additions * make casing blocks invalid for mob spawns * add ITNT, powderbarrel * move stone block loading to be above ores so that the game loads * run datagen * make explosion not drop everything twice, fix renderers * sync explosion to clients if on server, fix dynamite movement, remove exact copy of movement code from GTExplosiveEntity * reviews * ignore existing recipes (GregTechCEu#1192) * make TagPrefix get the recipe provider in the generator method to clean up the recipe handlers * make MaterialRecipeHandler not add compression recipes for ignored materials * fix fluid locking (GregTechCEu#1196) * Fix when autoBuild, reducing inventory even when block placement fails. (GregTechCEu#1179) * fix a bug in cn.lang * fix: when autoBuild, reducing inventory even when block placement fails * change: Do not adjust facing of the blocks already placed * change: Do not adjust facing of the blocks already placed, part 2 * fix laser & optical pipes not dropping anything (GregTechCEu#1197) * add back chest recipe replacement (GregTechCEu#1198) * Update for ru_ru lang.file (GregTechCEu#1199) * Translated using Weblate (Russian) Currently translated at 99.5% (5382 of 5405 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 99.7% (5394 of 5405 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ --------- Co-authored-by: Western01 <[email protected]> * fix KJS bedrock/fluid veins, cable transfer rate in scanner (GregTechCEu#1200) * fix: setting the dimenson for bedrock ore and fluid veins in kjs * fix: display correct voltage for average cable transfer (port. scanner) * fix parallel issues (GregTechCEu#1201) * remake parallel logic in hopes of it being faster this way * fix multi smelter not overclocking (fixes GregTechCEu#1191) * move EU/t logic into EURecipeCapability, also check for tick inputs in ParallelLogic * fix OC display doing an overclock for ULV (GregTechCEu#1202) * fix crash if can't parallel (oops,,,), steam machine parallel (GregTechCEu#1203) * how'd it not commit these last time,,, (GregTechCEu#1204) * fix crash if can't parallel (oops,,,), steam machine parallel * what the fuck how did it not commit these * fix raw ores being able to be smelted into ingots even with NO_SMELTING flag. (GregTechCEu#1206) * fixed up treated wood sign creating lang for air (GregTechCEu#1215) * fix sign rendering * Fix AveragingPerTickCounter.checkValueState (GregTechCEu#1205) * fix chainsaw durability usage (GregTechCEu#1218) * Fix mud recipe, use circuit 1 to distinguish it from fertilizer recipe (GregTechCEu#1213) (cherry picked from commit d957b0a01e180430ae0bfe2cd4720cabc62da875) * move coil, filter & pss battery maps out of GTBlocks so addons have an easier time adding to them (GregTechCEu#1224) * ARMORS (GregTechCEu#1210) * remake: feat: start on armor system, netherite + echo stuff * holy shit armor again?!?!??! * more stuff:tm: * this should:tm: do * add manual models for fluids (hoping this'll make them all have the actual textures?) * add manual liquid fuel jetpack model (for fluid), rename all the armor models to match modern IDs * run datagen * fixes (holy shit it work) (gotta figure out what the /**/ commented code is doing) * fix keys being wack * fix armor damaging * fix armor protection display, durability/power bars * fix some other direct usages of ComponentItem instead of IComponentItem, fix jetpack movement * fix FluidRecipeHandler not reporting its tank count correctly * clean up unnecessary PowerlessJetpack code * fix PowerlessJetpack recipe matching not having an EU out at all * fix QuarkTech:tm: pants giving flight?? * fix uses of wrong container sync method * fix armor attribute modifier values * remove new materials (no uses lol) * fix some crashes (GregTechCEu#1226) * fix prod crash * fix bedrock ore crash that sometimes happened * Fixes (GregTechCEu#1207) * fix: update lang for portable scanner * fix: machine controller works with indirect redstone signal as well now * refactor: cleanup LargeTurbineMachine * chore: version and changelog * chore: remove unnecessary changelog entry * chore: changelog * fix errors part 1 * fix errors part 2 --------- Co-authored-by: iouter <[email protected]> Co-authored-by: marisathewitch <[email protected]> Co-authored-by: Western01 <[email protected]> Co-authored-by: MOYINGCrystal <[email protected]> Co-authored-by: Mikerooni <[email protected]> Co-authored-by: YoungOnion <[email protected]> Co-authored-by: richie3366 <[email protected]>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
because I forgot to push these.
or add the stone blob worldgen.