diff --git a/AlternativeConfigs/loliasm.cfg b/AlternativeConfigs/loliasm.cfg deleted file mode 100644 index 9eaed34d..00000000 --- a/AlternativeConfigs/loliasm.cfg +++ /dev/null @@ -1,364 +0,0 @@ -# Configuration file - -bakedquad { - # Classes where BakedQuad::new calls need to be redirected. As of 3.2, this should be done automatically, while the changes will show in the next launch - - S:classesThatCallBakedQuadCtor < - lumien.randomthings.client.models.blocks.ModelCubeAll - appeng.client.render.cablebus.QuadRotator - org.cyclops.integrateddynamics.client.model.CableModelBase - forestry.storage.models.ModelCrate - codechicken.lib.util.VertexDataUtils - net.minecraft.client.renderer.block.model.FaceBakery - lumien.randomthings.client.models.blocks.ModelCubeOverlay - appeng.client.render.model.AutoRotatingModel - li.cil.oc.client.renderer.block.SmartBlockModelBase$class - com.rwtema.extrautils2.utils.helpers.QuadHelper - li.cil.oc.client.renderer.block.RobotModel$ItemModel$ - org.cyclops.cyclopscore.client.model.DynamicBaseModel - com.rwtema.extrautils2.backend.model.PassthruModelItem$4$1 - com.rwtema.extrautils2.items.ItemSnowglobe - buildcraft.lib.client.model.MutableQuad - com.elytradev.architecture.client.render.target.RenderTargetBaked - appeng.thirdparty.codechicken.lib.model.Quad - thaumcraft.client.lib.obj.MeshModel - com.rwtema.extrautils2.backend.model.Box - appeng.client.render.model.ColorApplicatorBakedModel - com.rwtema.careerbees.ProxyClient$ModelBark - codechicken.lib.render.buffer.BakingVertexBuffer - li.cil.oc.client.renderer.block.SmartBlockModelBase$$anonfun$bakeQuads$1 - dan200.computercraft.client.render.ModelTransformer$BakedQuadBuilder - openblocks.client.renderer.item.devnull.DevNullItemOverride - com.jaquadro.minecraft.chameleon.render.ChamRenderLL - > - - # Classes that extend BakedQuad need to be handled separately. This should be done automatically, while the changes will show in the next launch - - S:classesThatExtendBakedQuad < - - > - - # Log classes that need their BakedQuad::new calls redirected - - B:logClassesThatCallBakedQuadCtor=true - - # Allows bucket models to re-use UnpackedBakedQuads - - B:reuseBucketQuads=true - - # Saves RAM by removing BakedQuad instance variables, redirecting BakedQuad creation to specific BakedQuad child classes. This will be forcefully turned off when Optifine is installed as it is incompatible - - B:squashBakedQuads=true -} - - -canonicalization { - # Deduplicate ASMData related Strings - - B:asmDataStringCanonicalization=true - - # Deduplicate Java's FilePermission cache's names within SecureClassLoader - - B:filePermissionsCacheCanonicalization=false - - # Deduplicate LockCode when reading from NBT - - B:lockCodeCanonicalization=true - - # Deduplicate Model Conditions. Enable this if you do not have Foamfix installed - - B:modelConditionCanonicalization=false - - # Deduplicate String keys in NBTTagCompound - - B:nbtBackingMapStringCanonicalization=true - - # Deduplicate Strings in NBTTagString - - B:nbtTagStringBackingStringCanonicalization=true - - # Deduplicate package strings when Forge gathers them when mod candidates are loaded - - B:packageStringCanonicalization=true - - # Deduplicate ResourceLocation and ModelResourceLocation instances - - B:resourceLocationCanonicalization=true - - # Deduplicate TextureAtlasSprite's names - - B:spriteNameCanonicalization=true - - # EXPERIMENTAL: Deduplicate BakedQuad's Vertex Data array. If you see any artifacting in-game, turn this off and report it on github - - B:vertexDataCanonicalization=true -} - - -capability { - # Delays ItemStack's capabilities from being initialized until they needed to be - - B:delayItemStackCapabilityInit=true - - # Fixes Astral Sorcery applying AmuletHolderCapability to large amount of ItemStacks when it isn't needed. This option will be ignored when Astral Sorcery isn't installed - - B:fixAmuletHolderCapability=true -} - - -datastructures { - # Improve hashing performances of various objects - - B:efficientHashing=true - - # Clears and trims ModelManager data structures after models are loaded and baked - - B:moreModelManagerCleanup=true - - # Optimizing FurnaceRecipes. FastFurnace will see very little benefit when this option is turned on - - B:optimizeFurnaceRecipeStore=true - - # Optimize NBTTagCompound's backing map structure - - B:optimizeNBTTagCompoundBackingMap=true - - # Optimizes registries - - B:optimizeRegistries=true - - # If JEI/HEI is installed, replace vanilla search trees with JEI's, decreases memory usage, loading time and adds more features to normal creative menu searching - - B:replaceSearchTreeWithJEISearching=true - - # EXPERIMENTAL: Strips ItemStack of some of its fields as it stores some near-useless references - - B:stripNearUselessItemStackFields=true -} - - -events { - # [EXPERIMENTAL]: Stops mass object creation when Forge is firing events, this can decrease Garbage Collection pressure - - B:makeEventsSingletons=false -} - - -forgefixes { - # Fixes Forge's EntityEntry calling a slow Constructor::newInstance call every time an entity spawns, it is replaced with a fast Function::get generated from LambdaMetafactory#metafactory - - B:fasterEntitySpawnPreparation=true - - # Works around a crash when too many dimensions are registered, caused by JVM optimization issues. - - B:fixDimensionTypesInliningCrash=true - - # Fixes Forge's mistake of annotating FillBucketEvent#getFilledBucket as @Nonnull when the contract isn't fulfilled nor checked. First discovered here: https://github.com/Divine-Journey-2/main/issues/295 - - B:fixFillBucketEventNullPointerException=true - - # Fixes a vanilla-forge code interaction bug leading to a possible ConcurrentModificationException/StackOverflowError crash. First discovered here: https://github.com/GregTechCE/GregTech/issues/1256 - - B:fixTileEntityOnLoadCME=true - - # EXPERIMENTAL: Forcibly remove Forge's FMLSecurityManager that adds very very slight overheads in calls that requires permission checks - - B:removeForgeSecurityManager=false -} - - -furnace { - # When optimizeFurnaceRecipeStore is true, experience is determined by who registers the entry first, this is also the fallback option if all three options aren't true - - B:furnaceExperienceFCFS=true - - # When optimizeFurnaceRecipeStore is true, experience is determined by whichever entry gives the most experience - - B:furnaceExperienceMost=false - - # When optimizeFurnaceRecipeStore is true, experience is determined the vanilla way, this method is the most inefficient and random - - B:furnaceExperienceVanilla=false -} - - -launchwrapper { - # Invalidate and clean cache entries when the game finishes loading (onto the main screen). Loading into the first world may take longer. This option wouldn't do anything if 'cleanupLaunchClassLoaderLate' is 'true' - - B:cleanCachesOnGameLoad=false - - # Cleanup some redundant data structures in LaunchClassLoader at the earliest point possible (when LoliASM is loaded). Helpful for those that don't have enough RAM to load into the game. This can induce slowdowns while loading the game in exchange for more available RAM - - B:cleanupLaunchClassLoaderEarly=false - - # Cleanup some redundant data structures in LaunchClassLoader at the latest point possible (when the game reaches the Main Screen). This is for those that have enough RAM to load the game and do not want any slowdowns while loading. Note: if 'cleanupLaunchClassLoaderEarly' is 'true', this option will be ignored - - B:cleanupLaunchClassLoaderLate=true - - # Disable the unusused Package Manifest map. This option coincides with Foamfix's 'removePackageManifestMap' option - - B:disablePackageManifestMap=true - - # Disabling caching of classes. This will induce major slowdowns to game/world loads in exchange for more available RAM - - B:noClassCache=false - - # Disabling caching of resources (Class Bytes). This will induce slowdowns to game/world loads in exchange for more available RAM - - B:noResourceCache=false - - # Weaken the caching of classes. This allows the GC to free up more space when the caches are no longer needed. If 'noClassCache' is 'true', this option will be ignored - - B:weakClassCache=true - - # Weaken the caching of resources (Class Bytes). This allows the GC to free up more space when the caches are no longer needed. If 'noResourceCache' is 'true', this option will be ignored. This option coincides with Foamfix's 'weakenResourceCache' option - - B:weakResourceCache=true -} - - -logging { - # Allow the game to keep running after crashes as well as adding more information and deobfuscating the crash reports, inspired by VanillaFix - - B:crashReportImprovements=true - - # When crashReportImprovements is true, disallow toasts from popping up and carry on playing while keeping crashes silent - - B:hideToastsAndContinuePlaying=true - - # When crashReportImprovements is true, allow the player to return to the main menu when a crash occurs, inspired by VanillaFix - - B:returnToMainMenuAfterCrash=true - - # Rewrite logging output with deobfuscated names when applicable, inspired by VanillaFix - - B:rewriteLoggingWithDeobfuscatedNames=true -} - - -mcfixes { - # Fixes MC-129057: https://bugs.mojang.com/browse/MC-129057 - - B:fixMC129057=true - - # Fixes MC-129556: https://bugs.mojang.com/browse/MC-129556 - - B:fixMC129556=true - - # Fixes MC-186052: https://bugs.mojang.com/browse/MC-186052 - - B:fixMC186052=true - - # Fixes MC-30845: https://bugs.mojang.com/browse/MC-30845 - - B:fixMC30845=true - - # Fixes MC-31681: https://bugs.mojang.com/browse/MC-31681 - - B:fixMC31681=true - - # Fixes MC-88176: https://bugs.mojang.com/browse/MC-88176 - - B:fixMC88176=true - - # Limits skin downloading threads to a maximum of half of available CPU cores - - B:limitSkinDownloadingThreads=true - - # Resolves MC-2071: https://bugs.mojang.com/browse/MC-2071 - - B:resolveMC2071=true -} - - -misc { - # Process screenshots and print to chat asynchronously - - B:asyncScreenshot=true - - # [W.I.P] - EXPERIMENTAL: Yet another attempt at caching classes between loads - - B:classCaching=false - - # Copy image after screenshotting to clipboard - - B:copyScreenshotToClipboard=false - - # Use updated CA Certs that was included in 8u311. This most notably fixes 8u51 certs issues - - B:outdatedCaCertsFix=true - - # Optimizes FluidRegistry::enableUniversalBucket check - - B:quickerEnableUniversalBucketCheck=true - - # For some reason Mojang decided to cache int buffers and arrays after a screenshot is taken, this makes sure they're never cached - - B:releaseScreenshotCache=true - - # Removes forced garbage collection calls, inspired by VanillaFix, can make world loading faster - - B:removeExcessiveGCCalls=true - - # Allows changing of dimensions to be smooth and nearly instantaneous, inspired by VanillaFix - - B:smoothDimensionChange=true - - # Strips the boring instanced Random object from SoundEventAccessors and uses ThreadLocalRandom instead - - B:stripInstancedRandomFromSoundEventAccessor=true - - # Adjust thread priorities to improve performance on systems with few cores - - B:threadPriorityFix=true -} - - -modfixes { - # When Better with Mods is installed, optimize Blasting Oil related events. The original implementation harms server performance at any given moment. This option will be ignored when Better with Mods isn't installed - - B:bwmBlastingOilOptimization=true - - # EXPERIMENTAL: When ChickenASM (Library of CodeChickenLib and co.) is installed, ClassHierarchyManager can cache a lot of Strings and seem to be unused in any transformation purposes. This clears ClassHierarchyManager of those redundant strings. This option will be ignored when ChickenASM isn't installed - - B:cleanupChickenASMClassHierarchyManager=true - - # When Extra Utilities 2 is installed, disable the crafter's rendering of the item being crafted, this can reduce lag, ignores fixXU2CrafterCrash config option - - B:disableXU2CrafterRendering=false - - # When Immersive Engineering is installed, sometimes it or it's addons can induce an ArrayIndexOutOfBoundsException in BlockIEBase#getPushReaction. This option will be ignored when IE isn't installed - - B:fixBlockIEBaseArrayIndexOutOfBoundsException=true - - # When TerraFirmaCraft is installed, fix the falling block's false starting position - - B:fixTFCFallingBlockFalseStartingTEPos=true - - # When Extra Utilities 2 is installed, fix and optimize mechanical crafter's rendering - - B:fixXU2CrafterCrash=true - - # When Just Enough Items is installed, it deduplicates strings in the generated generalized suffix trees' edge labels. This option will be ignored when Just Enough Items isn't installed - - B:labelCanonicalization=true - - # Optimizes Astral Sorcery's Resplendent Prism related functions. This option will be ignored when Astral Sorcery isn't installed - - B:optimizeAmuletRelatedFunctions=true - - # When Electroblob's Wizardry is installed, optimize the search for arcane locked tile entities to render - - B:optimizeArcaneLockRendering=true - - # When QMD is installed, optimize its BeamRenderer. The original implementation harms client performance heavily (takes ~5% of each tick time). This option will be ignored when QMD isn't installed - - B:optimizeQMDBeamRenderer=true - - # When EvilCraft Compat + EnderIO is installed, repair the compatibility module - - B:repairEvilCraftEIOCompat=true - - # When CraftTweaker is installed, large modpacks tend to stall in the last stage of loading, when CraftTweaker inexplicably recalculates search trees. This option will be ignored when CraftTweaker isn't installed - - B:skipCraftTweakerRecalculatingSearchTrees=true -} - - -remapper { - # Optimizing Forge's Remapper for not storing redundant entries - - B:optimizeFMLRemapper=true -} - - -rendering { - # Optimizes some rendering features, not game-breaking; however, negligible at times - - B:optimizeSomeRendering=true - - # Strip unnecessary locals in RenderHelper::enableStandardItemLighting, no idea why it's there - - B:stripUnnecessaryLocalsInRenderHelper=true -} - - -spark { - # Allow LoliASM's Spark profiling to include all threads that are present - - B:includeAllThreadsWhenProfiling=true - - # When Spark is installed, profile the loading of FMLConstructionEvent stage - - B:sparkProfileConstructionStage=false - - # When Spark is installed, profile the loading of coremods, but only those that load after LoliASM - - B:sparkProfileCoreModLoading=false - - # When Spark is installed, profile the loading of the game in its entirety - - B:sparkProfileEntireGameLoad=false - - # When Spark is installed, profile the loading of the world in its entirety - - B:sparkProfileEntireWorldLoad=false - - # When Spark is installed, profile the loading of FMLModIdMappingEvent stage, this is the last event fired before the game is finalized - - B:sparkProfileFinalizingStage=false - - # When Spark is installed, profile the loading of FMLInitializationEvent stage - - B:sparkProfileInitializationStage=false - - # When Spark is installed, profile the loading of FMLLoadCompleteEvent stage - - B:sparkProfileLoadCompleteStage=false - - # When Spark is installed, profile the loading of FMLPostInitializationEvent stage - - B:sparkProfilePostInitializationStage=false - - # When Spark is installed, profile the loading of FMLPreInitializationEvent stage - - B:sparkProfilePreInitializationStage=false - - # When Spark is installed, profile the loading of FMLServerAboutToStartEvent stage - - B:sparkProfileWorldAboutToStartStage=false - - # When Spark is installed, profile the loading of FMLServerStartedEvent stage - - B:sparkProfileWorldStartedStage=false - - # When Spark is installed, profile the loading of FMLServerStartingEvent stage - - B:sparkProfileWorldStartingStage=false - - # When Spark is installed, summarize the heap space (/spark heapsummary) when the game finishes loading - - B:sparkSummarizeHeapSpaceAfterGameLoads=false - - # When Spark is installed, summarize the heap space (/spark heapsummary) when the world finishes loading - - B:sparkSummarizeHeapSpaceAfterWorldLoads=false -} - - -textures { - # Calculate and send animated textures only when needed to the GPU, better than VanillaFix's textureFixes config - - B:onDemandAnimatedTextures=false - - # Releases TextureAtlasSprite's framesTextureData. Won't touch custom TextureAtlasSprite implementations - - B:releaseSpriteFramesCache=true -} - - diff --git a/config/AppliedEnergistics2/CustomRecipes.cfg b/config/AppliedEnergistics2/CustomRecipes.cfg index 0badd9d1..f863b882 100644 --- a/config/AppliedEnergistics2/CustomRecipes.cfg +++ b/config/AppliedEnergistics2/CustomRecipes.cfg @@ -1,7 +1,7 @@ # Configuration file cache { - S:digest=eb13d3c1362a9ee1c23a2d8b2b2710f0 + S:digest=7a9f1321721d78bfa92f9c5d8c704db8 # Caching can save processing time, if there are a lot of items. [default: true] B:enableCache=true @@ -19,4 +19,3 @@ general { B:exportItemNames=true } - diff --git a/config/AppliedEnergistics2/VersionChecker.cfg b/config/AppliedEnergistics2/VersionChecker.cfg index 94ea4ef6..e6db865a 100644 --- a/config/AppliedEnergistics2/VersionChecker.cfg +++ b/config/AppliedEnergistics2/VersionChecker.cfg @@ -3,7 +3,7 @@ cache { # Waits as many hours, until it checks again. [range: 0 ~ 168, default: 24] I:interval=24 - S:lastCheck=1745629696771 + S:lastCheck=1746750604605 } @@ -27,4 +27,3 @@ general { B:enabled=true } - diff --git a/config/CustomMainMenu/mainmenu.json b/config/CustomMainMenu/mainmenu.json index 91eb2ac3..f5fc80e7 100644 --- a/config/CustomMainMenu/mainmenu.json +++ b/config/CustomMainMenu/mainmenu.json @@ -47,7 +47,7 @@ "mods": { "text" : "fml.menu.mods", - "hoverText" : "Powered by AoA", + "hoverText" : "AoA为主框架", "posX" : -100, "posY" : 96, "width" : 200, @@ -62,7 +62,7 @@ "options": { "text" : "menu.options", - "hoverText" : "Check keybinds!", + "hoverText" : "查看按键绑定！", "posX" : -100, "posY" : 144, "width" : 98, @@ -76,8 +76,8 @@ "performance": { - "text" : "Improve Performance", - "hoverText" : "Faster load times!", + "text" : "改进性能", + "hoverText" : "加载速度更快！", "posX" : -100, "posY" : 192, "width" : 200, @@ -85,14 +85,14 @@ "action" : { "type": "openLink", - "link": "https://github.com/sainagh/meatballcraft/wiki/%5B0.17.0%5D-Improving-Performance" + "link": "https://github.com/sainagh/meatballcraft/wiki/%5B0.18%5D-Improving-Performance" } }, "quit": { "text" : "menu.quit", - "hoverText" : "See ya!", + "hoverText" : "再见！", "posX" : 2, "posY" : 144, "width" : 98, @@ -136,7 +136,7 @@ "discord": { "text" : "Discord", - "hoverText" : "Join the meatballs!", + "hoverText" : "加入肉丸！", "posX" : -100, "posY" : 120, "width" : 200, @@ -152,8 +152,8 @@ { "mojang": { - "text" : "Copyright Mojang AB. Do not distribute!", - "hoverText" : "�nCopyright Mojang AB. Do not distribute!", + "text" : "© Mojang AB 请勿二次分发！", + "hoverText" : "�n© Mojang AB 请勿二次分发！", "posX" : -197, "posY" : -10, "color" : -1, @@ -166,8 +166,8 @@ }, "soundtrack": { - "text" : "Soundtrack:\n It's not over - Darren Curtis Music", - "hoverText" : "Soundtrack:\n AhAhAhAHAHH", + "text" : "配乐：\n It's not over - Darren Curtis Music", + "hoverText" : "配乐：\n AhAhAhAHAHH", "posX" : -197, "posY" : -30, "color" : -1, diff --git a/config/InvTweaks.cfg b/config/InvTweaks.cfg index 2a969f62..98614b49 100644 --- a/config/InvTweaks.cfg +++ b/config/InvTweaks.cfg @@ -1,6 +1,6 @@ #Inventory Tweaks Configuration #(Regarding shortcuts, all key names can be found at: http://legacy.lwjgl.org/javadoc/org/lwjgl/input/Keyboard.html) -#Sat Apr 26 10:18:12 PDT 2025 +#Thu May 08 18:25:57 PDT 2025 enableMiddleClick=true showChestButtons=true enableSortingOnPickup=false @@ -19,4 +19,4 @@ shortcutKeyOneItem=LCONTROL, RCONTROL shortcutKeyToUpperSection=UP shortcutKeyToLowerSection=DOWN shortcutKeyDrop=LALT, RALT -version=1.63+release.109.220f184 +version=1.63+release.109.220f184 \ No newline at end of file diff --git a/config/ItemBlacklist.json b/config/ItemBlacklist.json index 3308ceda..25870063 100644 --- a/config/ItemBlacklist.json +++ b/config/ItemBlacklist.json @@ -477,36 +477,6 @@ "damage": "*" } ], - "423": [ - { - "item": "xreliquary:rod_of_lyssa", - "damage": "*" - }, - { - "item": "abyssalcraft:scroll", - "damage": "*" - }, - { - "item": "abyssalcraft:unique_scroll", - "damage": "*" - }, - { - "item": "rftools:storage_scanner", - "damage": "*" - }, - { - "item": "rftoolsdim:dimension_builder", - "damage": "*" - }, - { - "item": "rftoolsdim:dimension_enscriber", - "damage": "*" - }, - { - "item": "rftoolsdim:dimlet_workbench", - "damage": "*" - } - ], "170": [ { "item": "xreliquary:rod_of_lyssa", @@ -791,6 +761,14 @@ { "item": "rftoolsdim:dimlet_workbench", "damage": "*" + }, + { + "item": "twilightforest:charm_of_life_1", + "damage": "*" + }, + { + "item": "twilightforest:charm_of_life_2", + "damage": "*" } ], "1": [ @@ -827,6 +805,126 @@ "damage": "*" } ], + "420": [ + { + "item": "abyssalcraft:scroll", + "damage": "*" + }, + { + "item": "abyssalcraft:unique_scroll", + "damage": "*" + }, + { + "item": "rftoolsdim:dimension_builder", + "damage": "*" + }, + { + "item": "rftoolsdim:dimension_enscriber", + "damage": "*" + }, + { + "item": "rftoolsdim:dimlet_workbench", + "damage": "*" + }, + { + "item": "twilightforest:charm_of_life_1", + "damage": "*" + }, + { + "item": "twilightforest:charm_of_life_2", + "damage": "*" + } + ], + "421": [ + { + "item": "abyssalcraft:scroll", + "damage": "*" + }, + { + "item": "abyssalcraft:unique_scroll", + "damage": "*" + }, + { + "item": "rftoolsdim:dimension_builder", + "damage": "*" + }, + { + "item": "rftoolsdim:dimension_enscriber", + "damage": "*" + }, + { + "item": "rftoolsdim:dimlet_workbench", + "damage": "*" + }, + { + "item": "twilightforest:charm_of_life_1", + "damage": "*" + }, + { + "item": "twilightforest:charm_of_life_2", + "damage": "*" + } + ], + "422": [ + { + "item": "abyssalcraft:scroll", + "damage": "*" + }, + { + "item": "abyssalcraft:unique_scroll", + "damage": "*" + }, + { + "item": "rftoolsdim:dimension_builder", + "damage": "*" + }, + { + "item": "rftoolsdim:dimension_enscriber", + "damage": "*" + }, + { + "item": "rftoolsdim:dimlet_workbench", + "damage": "*" + }, + { + "item": "twilightforest:charm_of_life_1", + "damage": "*" + }, + { + "item": "twilightforest:charm_of_life_2", + "damage": "*" + } + ], + "423": [ + { + "item": "abyssalcraft:scroll", + "damage": "*" + }, + { + "item": "abyssalcraft:unique_scroll", + "damage": "*" + }, + { + "item": "rftoolsdim:dimension_builder", + "damage": "*" + }, + { + "item": "rftoolsdim:dimension_enscriber", + "damage": "*" + }, + { + "item": "rftoolsdim:dimlet_workbench", + "damage": "*" + }, + { + "item": "twilightforest:charm_of_life_1", + "damage": "*" + }, + { + "item": "twilightforest:charm_of_life_2", + "damage": "*" + } + ], "146": [ { "item": "xreliquary:rod_of_lyssa", @@ -1375,6 +1473,14 @@ { "item": "rftoolsdim:dimlet_workbench", "damage": "*" + }, + { + "item": "twilightforest:charm_of_life_1", + "damage": "*" + }, + { + "item": "twilightforest:charm_of_life_2", + "damage": "*" } ], "813": [ @@ -1596,6 +1702,48 @@ "item": "twilightforest:charm_of_life_2", "damage": "*" } + ], + "427": [ + { + "item": "ae2fc:wireless_fluid_pattern_terminal", + "damage": "*" + }, + { + "item": "appliedenergistics2:wireless_terminal", + "damage": "*" + }, + { + "item": "appliedenergistics2:wireless_crafting_terminal", + "damage": "*" + }, + { + "item": "appliedenergistics2:wireless_pattern_terminal", + "damage": "*" + }, + { + "item": "appliedenergistics2:wireless_fluid_terminal", + "damage": "*" + }, + { + "item": "appliedenergistics2:wireless_interface_terminal", + "damage": "*" + }, + { + "item": "ae2exttable:wireless_basic_crafting_terminal", + "damage": "*" + }, + { + "item": "ae2exttable:wireless_advanced_crafting_terminal", + "damage": "*" + }, + { + "item": "ae2exttable:wireless_elite_crafting_terminal", + "damage": "*" + }, + { + "item": "ae2exttable:wireless_ultimate_crafting_terminal", + "damage": "*" + } ] } \ No newline at end of file diff --git a/config/ProjectE/mapping.cfg b/config/ProjectE/mapping.cfg index 5fbe7857..9a616946 100644 --- a/config/ProjectE/mapping.cfg +++ b/config/ProjectE/mapping.cfg @@ -56,7 +56,7 @@ mapperconfigurations { I:divinerpgpriority=1 I:equivalentenergisticspriority=1 - # Priority for Mod with ModId = expequiv. Values: 3950 [range: 0 ~ 512, default: 1] + # Priority for Mod with ModId = expequiv. Values: 3953 [range: 0 ~ 512, default: 1] I:expequivpriority=1 I:metallurgypriority=1 @@ -245,7 +245,7 @@ mapperconfigurations { apicustomconversionmapper { allow { - # Allow Mod expequiv to add its 82398 Recipes to the EMC Calculation [default: true] + # Allow Mod expequiv to add its 82390 Recipes to the EMC Calculation [default: true] B:expequiv=true } @@ -253,4 +253,3 @@ mapperconfigurations { } - diff --git a/config/Universal Tweaks - Bugfixes.cfg b/config/Universal Tweaks - Bugfixes.cfg index bb2c1e56..d0416d0c 100644 --- a/config/Universal Tweaks - Bugfixes.cfg +++ b/config/Universal Tweaks - Bugfixes.cfg @@ -238,10 +238,13 @@ general { # CONCURRENT_LINKED_HASHMAP S:"Tile Entity Map"=CONCURRENT_LINKED_HASHMAP + # Always builds village structures with biome-specific blocks + # Improves compatibility with mods such as BiomeTweaker + B:"Village Component Parts"=true + # Fixes witch hut structure data not accounting for the height it is generated at B:"Witch Huts"=true } } - diff --git a/config/Universal Tweaks - Mod Integration.cfg b/config/Universal Tweaks - Mod Integration.cfg index ec33b644..72133945 100644 --- a/config/Universal Tweaks - Mod Integration.cfg +++ b/config/Universal Tweaks - Mod Integration.cfg @@ -215,6 +215,10 @@ general { mekanism { # Fixes various duplication exploits B:"Duplication Fixes"=true + + # Fixes a logic error allowing extracting fluids from fluid tanks regardless of requested fluid + # Has no effect when playing with Mekanism CEu + B:"Fluid Tank Extraction"=true } "mob stages" { @@ -470,65 +474,56 @@ general { } "tinkers' construct" { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - # Excludes gaseous fluids from being transferable via faucets + B:"Ceramics: Gaseous Fluids"=false + B:"Duplication Fixes"=true B:"Gaseous Fluids"=false - - # Hides tool/bow materials in the 'Materials and You' book - # Syntax: material - # Enabling debug logging prints all materials on game launch S:"Material Blacklist" < > - - # Determines the maximum number of possible items to display before not rendering any to prevent substantial lag - # 0 to disable rendering items in the smeltery entirely - # -1 for the default, which is always rendering items I:"Maximum Items to Render in Smeltery"=-1 - - # Suppresses special abilities of long swords and rapiers when shurikens are wielded in the offhand B:"Offhand Shuriken"=true - - # Caches all ore dictionary smelting recipes to speed up game loading B:"Ore Dictionary Cache"=true - - # Fixes server world being leaked to various particles B:"Particle Fixes"=true - - # Despawns unbreakable projectiles faster to improve framerates B:"Projectile Despawning"=true - - # Enables usage of tweaks in below category to customize Tinkers' tools stats B:"Tool Customization"=true "tool customization" { + S:"Attack Damage Decay Rate"=0.9 + D:"Cleaver Attack Damage Cutoff"=75.0 + D:"General Attack Damage Cutoff"=15.0 + D:"Longsword Attack Damage Cutoff"=65.0 + D:"PlusTiC: Katana Attack Damage Cutoff"=22.0 + D:"Rapier Attack Damage Cutoff"=55.0 + + # Enables usage of tweaks in below category to customize Tinkers' tools stats + B:"[1] Tool Customization"=true + + # Sets the attack damage cutoff at which diminishing returns start for any Tinkers' tool not listed here + # Default value: 15.0 + D:"[2] General Attack Damage Cutoff"=15.0 + + # Sets the attack damage cutoff at which diminishing returns start for the cleaver + # Default value: 25.0 + D:"[3] Cleaver Attack Damage Cutoff"=25.0 + + # Sets the attack damage cutoff at which diminishing returns start for the longsword + # Default value: 18.0 + D:"[4] Longsword Attack Damage Cutoff"=18.0 + + # Sets the attack damage cutoff at which diminishing returns start for the rapier + # Default value: 13.0 + D:"[5] Rapier Attack Damage Cutoff"=13.0 + + # Sets the attack damage cutoff at which diminishing returns start for the PlusTiC katana + # Default value: 22.0 + D:"[6] PlusTiC: Katana Attack Damage Cutoff"=22.0 + # Sets the rate at which a tool's attack damage incrementally decays depending on its damage cutoff # Default value: 0.9 # Range: 0.0 - 1.0 # Note: A rate of 1.0 means there is no damage decay # Note: The damage curve will cap the maximum value to (tool's damage cutoff)/(1 - decay rate) - S:"Attack Damage Decay Rate"=0.9 - - # Sets the attack damage cutoff at which diminishing returns start for the cleaver - # Default value: 25.0 - D:"Cleaver Attack Damage Cutoff"=75.0 - - # Sets the attack damage cutoff at which diminishing returns start for any Tinkers' tool not listed here - # Default value: 15.0 - D:"General Attack Damage Cutoff"=15.0 - - # Sets the attack damage cutoff at which diminishing returns start for the longsword - # Default value: 18.0 - D:"Longsword Attack Damage Cutoff"=65.0 - - # Sets the attack damage cutoff at which diminishing returns start for the PlusTiC katana - # Default value: 22.0 - D:"PlusTiC: Katana Attack Damage Cutoff"=22.0 - - # Sets the attack damage cutoff at which diminishing returns start for the rapier - # Default value: 13.0 - D:"Rapier Attack Damage Cutoff"=55.0 + S:"[7] Attack Damage Decay Rate"=0.9 } } @@ -680,6 +675,9 @@ general { } evilcraft { + # Avoid repeatedly running intensive calculations involving spawning a random Vengeance Spirit + B:"Vengeance Spirit Random Performance"=true + # Cache the result of Vengeance Spirit checks against the config, which may attempt to build and check against hundreds of Regex Patterns every tick B:"Vengeance Spirit Regex Cache"=true } @@ -735,6 +733,10 @@ general { B:"Baubles Compatibility"=true } + "gaia dimension" { + # Safely access a nullable array when checking recipes in the Restructurer + B:"Fix Restructurer Crash"=true + } + } - diff --git a/config/Universal Tweaks - Tweaks.cfg b/config/Universal Tweaks - Tweaks.cfg index 16f28c5c..3b27dd86 100644 --- a/config/Universal Tweaks - Tweaks.cfg +++ b/config/Universal Tweaks - Tweaks.cfg @@ -14,8 +14,6 @@ general { # Determines how tall cacti can grow I:"Cactus Size"=3 - - # Allows placing End Crystals without requiring Obsidian or Bedrock below B:"End Crystal Placing"=false # Determines the numerator of the block drop formula on explosions @@ -196,6 +194,23 @@ general { anvil { # Sets the experience level cap for anvil recipes I:"Anvil XP Level Cap"=40 + + # Allows repairing damaged anvils by right-clicking them with a repair item + B:"Repairable Anvil Toggle"=false + + ########################################################################################################## + # repairable anvil items + #--------------------------------------------------------------------------------------------------------# + # List of items which can be used to repair damaged anvils and their amount + # Syntax: modid:block, amount + # Syntax: oredict, amount + ########################################################################################################## + + "repairable anvil items" { + I:blockIron=1 + I:"minecraft:iron_ingot"=9 + } + } piston { @@ -208,6 +223,24 @@ general { > } + "end crystal placement" { + # Allows placing end crystals on more blocks than obsidian or bedrock below + B:"[1] End Crystal Placement Toggle"=false + + # List of blocks concerning placement of end crystals + # Behavior depends on the list mode + # Syntax: modid:block + S:"[2] Block List" < + > + + # Blacklist Mode: Blocks that don't allow placing of end crystals, others do + # Whitelist Mode: Blocks that allow placing of end crystals, others don't + # Valid values: + # WHITELIST + # BLACKLIST + S:"[3] List Mode"=BLACKLIST + } + } entities { @@ -310,6 +343,13 @@ general { # When viewing in third person, don't stop the camera on non-solid blocks B:"Third Person Ignores Non-solid Blocks"=false + # Controls villager professions in specified biomes + # Syntax: whitelist/blacklist;modid:biome=modid:profession,modid:profession,... + # Example 1: whitelist;minecraft:plains=minecraft:librarian,minecraft:priest + # Example 2: blacklist;minecraft:desert=minecraft:farmer + S:"Villager Profession Biome Restriction" < + > + # Allows creating Iron Golems with non-air blocks in the bottom corners of the structure B:"Weaken Golem Structure Requirements"=false @@ -849,8 +889,6 @@ general { misc { # Always displays the actual potion duration instead of `**:**` B:"Accurate Potion Duration"=true - - # Silently takes a screenshot every time an advancement is achieved B:"Advancement Screenshot"=false # Always returns the player to the main menu when quitting the game @@ -1278,6 +1316,25 @@ general { B:"Broadcast Wither Death Sound"=true } + "advancement screenshot" { + # Silently takes a screenshot every time an advancement is achieved + B:"[1] Advancement Screenshot Toggle"=false + + # Syntax: modid:advancement + S:"[2] Advancement List" < + > + + # Blacklist Mode: Advancements which are not captured, others are + # Whitelist Mode: Advancements which are captured, others are not + # Valid values: + # WHITELIST + # BLACKLIST + S:"[3] List Mode"=BLACKLIST + + # Cooldown in ticks after each capture to prevent lag through screenshot spam + I:"[4] Screenshot Cooldown"=20 + } + } performance { @@ -1490,4 +1547,3 @@ general { } - diff --git a/config/ZenUtils.cfg b/config/ZenUtils.cfg index 72fe1501..71b469ea 100644 --- a/config/ZenUtils.cfg +++ b/config/ZenUtils.cfg @@ -2,6 +2,6 @@ general { B:enableMixin=true + B:enableRandomTickEvent=false } - diff --git a/config/astralsorcery/amulet_enchantments.cfg b/config/astralsorcery/amulet_enchantments.cfg index 6547ead3..067e6097 100644 --- a/config/astralsorcery/amulet_enchantments.cfg +++ b/config/astralsorcery/amulet_enchantments.cfg @@ -7,7 +7,7 @@ ########################################################################################################## data { - # [default: [minecraft:protection:10], [minecraft:fire_protection:5], [minecraft:feather_falling:5], [minecraft:blast_protection:2], [minecraft:projectile_protection:5], [minecraft:respiration:2], [minecraft:aqua_affinity:2], [minecraft:thorns:1], [minecraft:depth_strider:2], [minecraft:frost_walker:2], [minecraft:sharpness:10], [minecraft:smite:5], [minecraft:bane_of_arthropods:5], [minecraft:knockback:5], [minecraft:fire_aspect:2], [minecraft:looting:2], [minecraft:sweeping:2], [minecraft:efficiency:10], [minecraft:silk_touch:1], [minecraft:unbreaking:5], [minecraft:fortune:2], [minecraft:power:10], [minecraft:punch:2], [minecraft:flame:2], [minecraft:infinity:1], [minecraft:luck_of_the_sea:2], [minecraft:lure:2], [minecraft:mending:2], [draconicevolution:enchant_reaper:2], [railcraft:wrecking:2], [railcraft:implosion:2], [railcraft:destruction:1], [railcraft:smack:1], [extrautils2:xu.kaboomerang:10], [extrautils2:xu.zoomerang:10], [extrautils2:xu.burnerang:10], [extrautils2:xu.bladerang:10], [extrautils2:xu.boomereaperang:10], [randomthings:magnetic:1], [openblocks:explosive:2], [openblocks:last_stand:5], [openblocks:flim_flam:2], [projectred-expansion:electric_efficiency:2], [advancedrocketry:spacebreathing:10], [endercore:xpboost:5], [endercore:autosmelt:2], [tombstone:shadow_step:2], [tombstone:soulbound:2], [tombstone:magic_siphon:2], [tombstone:plague_bringer:2], [tombstone:blessing:2], [tombstone:curse_of_bones:2], [enderio:witherarrow:5], [enderio:soulbound:1], [enderio:repellent:1], [enderio:witherweapon:5], [aerialaffinity:aerial_affinity:2], [aoa3:brace:1], [aoa3:intervention:1], [aoa3:archmage:1], [aoa3:sever:5], [aoa3:recharge:2], [aoa3:control:2], [aoa3:shell:5], [aoa3:crush:5], [aoa3:form:2], [ebwizardry:magic_sword:10], [ebwizardry:magic_bow:10], [ebwizardry:flaming_weapon:10], [ebwizardry:freezing_weapon:10], [ebwizardry:magic_protection:5], [ebwizardry:frost_protection:2], [ebwizardry:shock_protection:2], [bewitchment:magic_protection:1], [bibliocraft:bibliocraft.deathcompassench:1], [bibliocraft:bibliocraft.readingench:5], [divinerpg:rive:1], [divinerpg:aftershock:1], [mod_lavacow:poisonous:1], [mod_lavacow:lifesteal:1], [mod_lavacow:corrosive:1], [mod_lavacow:critical_boost:2], [soulshardsrespawn:soul_stealer:5], [thaumictinkerer:ascentboost:2], [thaumictinkerer:pounce:1], [thaumictinkerer:shockwave:5], [thaumictinkerer:slowfall:1], [thaumictinkerer:finalstrike:2], [thaumictinkerer:valiance:5], [thaumictinkerer:vamprisim:2], [thaumictinkerer:dispersedstrikes:2], [thaumictinkerer:focusedstrikes:2], [thaumictinkerer:quickdraw:2], [thaumictinkerer:tunnel:5], [thaumictinkerer:shatter:5], [thaumictinkerer:desintegrate:5], [thaumictinkerer:autosmelt:5], [variegated:manabound:1], [woot:headhunter:2], [abyssalcraft:coralium:2], [abyssalcraft:dread:2], [abyssalcraft:light_pierce:10], [abyssalcraft:iron_wall:5], [abyssalcraft:sapping:5], [abyssalcraft:multi_rend:2], [cofhcore:holding:5], [cofhcore:insight:5], [cofhcore:leech:5], [cofhcore:multishot:5], [cofhcore:smashing:2], [cofhcore:smelting:2], [cofhcore:soulbound:5], [cofhcore:vorpal:2], [cyclicmagic:enchantment.autosmelt:2], [cyclicmagic:enchantment.excavation:1], [cyclicmagic:enchantment.launch:10], [cyclicmagic:enchantment.lifeleech:10], [cyclicmagic:enchantment.magnet:1], [cyclicmagic:enchantment.multishot:1], [cyclicmagic:enchantment.quickdraw:1], [cyclicmagic:enchantment.venom:10], [cyclicmagic:enchantment.waterwalking:1], [cyclicmagic:enchantment.expboost:1], [astralsorcery:enchantment.as.nightvision:1], [astralsorcery:enchantment.as.smelting:1], [simplyjetpacks:fuel_efficiency:1]] + # [default: [minecraft:protection:10], [minecraft:fire_protection:5], [minecraft:feather_falling:5], [minecraft:blast_protection:2], [minecraft:projectile_protection:5], [minecraft:respiration:2], [minecraft:aqua_affinity:2], [minecraft:thorns:1], [minecraft:depth_strider:2], [minecraft:frost_walker:2], [minecraft:sharpness:10], [minecraft:smite:5], [minecraft:bane_of_arthropods:5], [minecraft:knockback:5], [minecraft:fire_aspect:2], [minecraft:looting:2], [minecraft:sweeping:2], [minecraft:efficiency:10], [minecraft:silk_touch:1], [minecraft:unbreaking:5], [minecraft:fortune:2], [minecraft:power:10], [minecraft:punch:2], [minecraft:flame:2], [minecraft:infinity:1], [minecraft:luck_of_the_sea:2], [minecraft:lure:2], [minecraft:mending:2], [draconicevolution:enchant_reaper:2], [railcraft:wrecking:2], [railcraft:implosion:2], [railcraft:destruction:1], [railcraft:smack:1], [extrautils2:xu.kaboomerang:10], [extrautils2:xu.zoomerang:10], [extrautils2:xu.burnerang:10], [extrautils2:xu.bladerang:10], [extrautils2:xu.boomereaperang:10], [randomthings:magnetic:1], [openblocks:explosive:2], [openblocks:last_stand:5], [openblocks:flim_flam:2], [projectred-expansion:electric_efficiency:2], [advancedrocketry:spacebreathing:10], [endercore:autosmelt:2], [endercore:xpboost:5], [tombstone:shadow_step:2], [tombstone:soulbound:2], [tombstone:magic_siphon:2], [tombstone:plague_bringer:2], [tombstone:blessing:2], [tombstone:curse_of_bones:2], [enderio:witherweapon:5], [enderio:soulbound:1], [enderio:witherarrow:5], [enderio:repellent:1], [aerialaffinity:aerial_affinity:2], [aoa3:brace:1], [aoa3:intervention:1], [aoa3:archmage:1], [aoa3:sever:5], [aoa3:recharge:2], [aoa3:control:2], [aoa3:shell:5], [aoa3:crush:5], [aoa3:form:2], [ebwizardry:magic_sword:10], [ebwizardry:magic_bow:10], [ebwizardry:flaming_weapon:10], [ebwizardry:freezing_weapon:10], [ebwizardry:magic_protection:5], [ebwizardry:frost_protection:2], [ebwizardry:shock_protection:2], [bewitchment:magic_protection:1], [bibliocraft:bibliocraft.deathcompassench:1], [bibliocraft:bibliocraft.readingench:5], [divinerpg:rive:1], [divinerpg:aftershock:1], [mod_lavacow:poisonous:1], [mod_lavacow:lifesteal:1], [mod_lavacow:corrosive:1], [mod_lavacow:critical_boost:2], [soulshardsrespawn:soul_stealer:5], [thaumictinkerer:ascentboost:2], [thaumictinkerer:pounce:1], [thaumictinkerer:shockwave:5], [thaumictinkerer:slowfall:1], [thaumictinkerer:finalstrike:2], [thaumictinkerer:valiance:5], [thaumictinkerer:vamprisim:2], [thaumictinkerer:dispersedstrikes:2], [thaumictinkerer:focusedstrikes:2], [thaumictinkerer:quickdraw:2], [thaumictinkerer:tunnel:5], [thaumictinkerer:shatter:5], [thaumictinkerer:desintegrate:5], [thaumictinkerer:autosmelt:5], [variegated:manabound:1], [woot:headhunter:2], [abyssalcraft:coralium:2], [abyssalcraft:dread:2], [abyssalcraft:light_pierce:10], [abyssalcraft:iron_wall:5], [abyssalcraft:sapping:5], [abyssalcraft:multi_rend:2], [cofhcore:holding:5], [cofhcore:insight:5], [cofhcore:leech:5], [cofhcore:multishot:5], [cofhcore:smashing:2], [cofhcore:smelting:2], [cofhcore:soulbound:5], [cofhcore:vorpal:2], [cyclicmagic:enchantment.autosmelt:2], [cyclicmagic:enchantment.excavation:1], [cyclicmagic:enchantment.launch:10], [cyclicmagic:enchantment.lifeleech:10], [cyclicmagic:enchantment.magnet:1], [cyclicmagic:enchantment.multishot:1], [cyclicmagic:enchantment.quickdraw:1], [cyclicmagic:enchantment.venom:10], [cyclicmagic:enchantment.waterwalking:1], [cyclicmagic:enchantment.expboost:1], [astralsorcery:enchantment.as.nightvision:1], [astralsorcery:enchantment.as.smelting:1], [simplyjetpacks:fuel_efficiency:1]] S:data < minecraft:protection:10 minecraft:fire_protection:5 @@ -66,4 +66,3 @@ data { > } - diff --git a/config/betterbuilderswands.cfg b/config/betterbuilderswands.cfg index 6c209ae8..0d5ff041 100644 --- a/config/betterbuilderswands.cfg +++ b/config/betterbuilderswands.cfg @@ -16,6 +16,22 @@ balance { general { # Blocks that won't work at all with the wands. E.g. 'minecraft:bedrock/0' S:blacklisted_blocks < + projectex:power_flower/0 + projectex:power_flower/1 + projectex:power_flower/2 + projectex:power_flower/3 + projectex:power_flower/4 + projectex:power_flower/5 + projectex:power_flower/6 + projectex:power_flower/7 + projectex:power_flower/8 + projectex:power_flower/9 + projectex:power_flower/10 + projectex:power_flower/11 + projectex:power_flower/12 + projectex:power_flower/13 + projectex:power_flower/14 + projectex:power_flower/15 > # Enable recipe for diamond builder's wand @@ -42,4 +58,3 @@ why_not { B:straymav_ultimate_wand=false } - diff --git a/config/betterquesting.cfg b/config/betterquesting.cfg index cda8e1c6..e6ff6ab5 100644 --- a/config/betterquesting.cfg +++ b/config/betterquesting.cfg @@ -38,7 +38,7 @@ general { B:"Use Quest Bookmark"=true # If view mode enabled, User can view all quests [default: false] - B:"View mode"=true + B:"View mode"=false # Zoom in on cursor. If false, zooms in on center of screen. [default: true] B:"Zoom In on Cursor"=true @@ -53,4 +53,3 @@ general { S:"Zoom Speed"=1.25 } - diff --git a/config/betterquesting/DefaultQuests/QuestLines/0.json b/config/betterquesting/DefaultQuests/QuestLines/0.json index b984bbc1..902c707f 100644 --- a/config/betterquesting/DefaultQuests/QuestLines/0.json +++ b/config/betterquesting/DefaultQuests/QuestLines/0.json @@ -5032,804 +5032,825 @@ "y:3": -120 }, "717:10": { + "id:3": 189570972, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": 3168, + "y:3": 96 + }, + "718:10": { "id:3": 191189457, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3744, "y:3": -12 }, - "718:10": { + "719:10": { "id:3": 262948337, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3528, "y:3": -264 }, - "719:10": { + "720:10": { "id:3": 267368053, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3564, "y:3": 60 }, - "720:10": { + "721:10": { "id:3": 283823173, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3636, "y:3": 24 }, - "721:10": { + "722:10": { "id:3": 285554142, "sizeX:3": 24, "sizeY:3": 24, "x:3": 1548, "y:3": 24 }, - "722:10": { + "723:10": { "id:3": 292319552, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3456, "y:3": 60 }, - "723:10": { + "724:10": { "id:3": 299237608, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3096, "y:3": 24 }, - "724:10": { + "725:10": { "id:3": 331342148, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3528, "y:3": -444 }, - "725:10": { + "726:10": { "id:3": 352701878, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3600, "y:3": -12 }, - "726:10": { + "727:10": { "id:3": 358789496, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3600, "y:3": -48 }, - "727:10": { + "728:10": { "id:3": 404913088, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3492, "y:3": 96 }, - "728:10": { + "729:10": { "id:3": 457497037, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3384, "y:3": -84 }, - "729:10": { + "730:10": { "id:3": 478677150, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3456, "y:3": 132 }, - "730:10": { + "731:10": { "id:3": 482221128, "sizeX:3": 24, "sizeY:3": 24, "x:3": 360, "y:3": 24 }, - "731:10": { + "732:10": { "id:3": 509587062, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3240, "y:3": -156 }, - "732:10": { + "733:10": { "id:3": 548069164, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3204, "y:3": -84 }, - "733:10": { + "734:10": { "id:3": 585232112, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3636, "y:3": -84 }, - "734:10": { + "735:10": { "id:3": 608217835, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3636, "y:3": -48 }, - "735:10": { + "736:10": { "id:3": 609304222, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3528, "y:3": -408 }, - "736:10": { + "737:10": { "id:3": 619388708, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3636, "y:3": -192 }, - "737:10": { + "738:10": { "id:3": 627303045, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3672, "y:3": -120 }, - "738:10": { + "739:10": { "id:3": 648075999, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3672, "y:3": -156 }, - "739:10": { + "740:10": { "id:3": 648991311, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3240, "y:3": -84 }, - "740:10": { + "741:10": { "id:3": 651565677, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3528, "y:3": -12 }, - "741:10": { + "742:10": { "id:3": 655786821, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3348, "y:3": -120 }, - "742:10": { + "743:10": { "id:3": 656465562, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3636, "y:3": -228 }, - "743:10": { + "744:10": { "id:3": 690563211, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3384, "y:3": -156 }, - "744:10": { + "745:10": { "id:3": 695054604, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3528, "y:3": -48 }, - "745:10": { + "746:10": { "id:3": 714682973, "sizeX:3": 24, "sizeY:3": 24, "x:3": 1836, "y:3": -264 }, - "746:10": { + "747:10": { "id:3": 716708024, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3312, "y:3": -120 }, - "747:10": { + "748:10": { "id:3": 718654576, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3564, "y:3": -12 }, - "748:10": { + "749:10": { "id:3": 726098530, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3240, "y:3": -48 }, - "749:10": { + "750:10": { "id:3": 745089078, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3276, "y:3": -48 }, - "750:10": { + "751:10": { "id:3": 769610759, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3384, "y:3": -48 }, - "751:10": { + "752:10": { "id:3": 770001395, "sizeX:3": 24, "sizeY:3": 24, "x:3": 108, "y:3": 96 }, - "752:10": { + "753:10": { "id:3": 790616998, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3600, "y:3": 24 }, - "753:10": { + "754:10": { "id:3": 809768846, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3672, "y:3": -228 }, - "754:10": { + "755:10": { "id:3": 813659679, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3672, "y:3": -192 }, - "755:10": { + "756:10": { "id:3": 814979819, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3528, "y:3": -156 }, - "756:10": { + "757:10": { "id:3": 826305078, "sizeX:3": 24, "sizeY:3": 24, "x:3": 1764, "y:3": 96 }, - "757:10": { + "758:10": { "id:3": 946204526, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3024, "y:3": 60 }, - "758:10": { + "759:10": { "id:3": 946686645, "sizeX:3": 24, "sizeY:3": 24, "x:3": 504, "y:3": -480 }, - "759:10": { + "760:10": { "id:3": 946808945, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3600, "y:3": 168 }, - "760:10": { + "761:10": { "id:3": 951871488, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3132, "y:3": -156 }, - "761:10": { + "762:10": { "id:3": 970927034, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3528, "y:3": -84 }, - "762:10": { + "763:10": { "id:3": 982745465, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3492, "y:3": -48 }, - "763:10": { + "764:10": { "id:3": 996129961, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3456, "y:3": -120 }, - "764:10": { + "765:10": { "id:3": 1047249538, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3168, "y:3": -192 }, - "765:10": { + "766:10": { "id:3": 1065510600, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3204, "y:3": -192 }, - "766:10": { + "767:10": { "id:3": 1066250269, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3564, "y:3": -84 }, - "767:10": { + "768:10": { "id:3": 1096669152, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3564, "y:3": 96 }, - "768:10": { + "769:10": { "id:3": 1111658403, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3528, "y:3": -228 }, - "769:10": { + "770:10": { "id:3": 1126830519, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3708, "y:3": 24 }, - "770:10": { + "771:10": { "id:3": 1142834944, "sizeX:3": 24, "sizeY:3": 24, "x:3": 1944, "y:3": -120 }, - "771:10": { + "772:10": { "id:3": 1151267866, "sizeX:3": 24, "sizeY:3": 24, "x:3": 2088, "y:3": 96 }, - "772:10": { + "773:10": { "id:3": 1155741702, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3708, "y:3": 60 }, - "773:10": { + "774:10": { "id:3": 1167022541, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3600, "y:3": -156 }, - "774:10": { + "775:10": { "id:3": 1210666494, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3492, "y:3": 132 }, - "775:10": { + "776:10": { "id:3": 1230893198, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3528, "y:3": -336 }, - "776:10": { + "777:10": { + "id:3": 1248230501, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": 972, + "y:3": -120 + }, + "778:10": { "id:3": 1281489751, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3600, "y:3": -192 }, - "777:10": { + "779:10": { "id:3": 1283790114, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3024, "y:3": 24 }, - "778:10": { + "780:10": { "id:3": 1313815980, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3384, "y:3": -12 }, - "779:10": { + "781:10": { "id:3": 1337626444, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3420, "y:3": -12 }, - "780:10": { + "782:10": { "id:3": 1338651064, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3564, "y:3": 24 }, - "781:10": { + "783:10": { "id:3": 1342545885, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3528, "y:3": -192 }, - "782:10": { + "784:10": { "id:3": 1343888287, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3240, "y:3": -120 }, - "783:10": { + "785:10": { "id:3": 1359221554, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3708, "y:3": -48 }, - "784:10": { + "786:10": { "id:3": 1382366189, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3276, "y:3": -192 }, - "785:10": { + "787:10": { "id:3": 1403059773, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3204, "y:3": -120 }, - "786:10": { + "788:10": { "id:3": 1415320476, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3276, "y:3": -156 }, - "787:10": { + "789:10": { "id:3": 1455291383, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3528, "y:3": -300 }, - "788:10": { + "790:10": { "id:3": 1479405903, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3276, "y:3": -120 }, - "789:10": { + "791:10": { "id:3": 1501196473, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3492, "y:3": -12 }, - "790:10": { + "792:10": { "id:3": 1501755393, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3528, "y:3": -372 }, - "791:10": { + "793:10": { "id:3": 1503761052, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3168, "y:3": -84 }, - "792:10": { + "794:10": { "id:3": 1514902796, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3636, "y:3": 168 }, - "793:10": { + "795:10": { "id:3": 1521131802, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3528, "y:3": -120 }, - "794:10": { + "796:10": { "id:3": 1522720224, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3600, "y:3": 96 }, - "795:10": { + "797:10": { "id:3": 1539715922, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3708, "y:3": 96 }, - "796:10": { + "798:10": { "id:3": 1577699709, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3708, "y:3": -120 }, - "797:10": { + "799:10": { "id:3": 1582606702, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3636, "y:3": -120 }, - "798:10": { + "800:10": { "id:3": 1597993732, "sizeX:3": 24, "sizeY:3": 24, "x:3": 1044, "y:3": -120 }, - "799:10": { + "801:10": { "id:3": 1611384648, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3456, "y:3": 96 }, - "800:10": { + "802:10": { + "id:3": 1647333921, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": 648, + "y:3": -228 + }, + "803:10": { "id:3": 1660051088, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3672, "y:3": -12 }, - "801:10": { + "804:10": { "id:3": 1671058553, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3060, "y:3": 24 }, - "802:10": { + "805:10": { "id:3": 1681217594, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3348, "y:3": -48 }, - "803:10": { + "806:10": { "id:3": 1681849124, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3204, "y:3": -156 }, - "804:10": { + "807:10": { "id:3": 1699700070, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3348, "y:3": -156 }, - "805:10": { + "808:10": { "id:3": 1703495878, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3528, "y:3": 60 }, - "806:10": { + "809:10": { "id:3": 1713406254, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3276, "y:3": -84 }, - "807:10": { + "810:10": { "id:3": 1724085619, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3600, "y:3": 60 }, - "808:10": { + "811:10": { "id:3": 1727374336, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3456, "y:3": -12 }, - "809:10": { + "812:10": { "id:3": 1829243204, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3636, "y:3": -12 }, - "810:10": { + "813:10": { "id:3": 1830502096, "sizeX:3": 24, "sizeY:3": 24, "x:3": 540, "y:3": -480 }, - "811:10": { + "814:10": { "id:3": 1836563922, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3780, "y:3": -12 }, - "812:10": { + "815:10": { "id:3": 1843441452, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3564, "y:3": -48 }, - "813:10": { + "816:10": { "id:3": 1900648883, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3672, "y:3": -84 }, - "814:10": { + "817:10": { "id:3": 1947473444, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3564, "y:3": -120 }, - "815:10": { + "818:10": { "id:3": 1979802923, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3060, "y:3": -120 }, - "816:10": { + "819:10": { "id:3": 1980945817, "sizeX:3": 24, "sizeY:3": 24, "x:3": 1116, "y:3": -84 }, - "817:10": { + "820:10": { "id:3": 2009829659, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3384, "y:3": 24 }, - "818:10": { + "821:10": { "id:3": 2022468480, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3240, "y:3": -192 }, - "819:10": { + "822:10": { "id:3": 2035349863, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3600, "y:3": 132 }, - "820:10": { + "823:10": { "id:3": 2044693951, "sizeX:3": 24, "sizeY:3": 24, "x:3": 720, "y:3": -372 }, - "821:10": { + "824:10": { "id:3": 2052397510, "sizeX:3": 24, "sizeY:3": 24, "x:3": 1836, "y:3": -228 }, - "822:10": { + "825:10": { "id:3": 2066003189, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3384, "y:3": -120 }, - "823:10": { + "826:10": { "id:3": 2070436398, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3492, "y:3": 60 }, - "824:10": { + "827:10": { "id:3": 2074294565, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3528, "y:3": 96 }, - "825:10": { + "828:10": { "id:3": 2078654107, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3240, "y:3": 24 }, - "826:10": { + "829:10": { "id:3": 2088399499, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3708, "y:3": -12 }, - "827:10": { + "830:10": { "id:3": 2106186542, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3348, "y:3": -84 }, - "828:10": { + "831:10": { "id:3": 2117123475, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3492, "y:3": -84 }, - "829:10": { + "832:10": { "id:3": 2125675950, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3420, "y:3": -48 }, - "830:10": { + "833:10": { "id:3": 2133694398, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3456, "y:3": 24 }, - "831:10": { + "834:10": { "id:3": 2143131475, "sizeX:3": 24, "sizeY:3": 24, diff --git a/config/betterquesting/DefaultQuests/QuestLines/3.json b/config/betterquesting/DefaultQuests/QuestLines/3.json index 7c772397..a7fc8f3a 100644 --- a/config/betterquesting/DefaultQuests/QuestLines/3.json +++ b/config/betterquesting/DefaultQuests/QuestLines/3.json @@ -2100,153 +2100,174 @@ "y:3": -468 }, "298:10": { + "id:3": 400947744, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": -72, + "y:3": -276 + }, + "299:10": { "id:3": 566141768, "sizeX:3": 24, "sizeY:3": 24, "x:3": -408, "y:3": 12 }, - "299:10": { + "300:10": { "id:3": 593507433, "sizeX:3": 24, "sizeY:3": 24, "x:3": 48, "y:3": -468 }, - "300:10": { + "301:10": { "id:3": 596821559, "sizeX:3": 24, "sizeY:3": 24, "x:3": 72, "y:3": -516 }, - "301:10": { + "302:10": { "id:3": 622606550, "sizeX:3": 24, "sizeY:3": 24, "x:3": 48, "y:3": -516 }, - "302:10": { + "303:10": { "id:3": 673076831, "sizeX:3": 24, "sizeY:3": 24, "x:3": 72, "y:3": -492 }, - "303:10": { + "304:10": { + "id:3": 746862659, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": -24, + "y:3": -276 + }, + "305:10": { + "id:3": 804922623, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": -432, + "y:3": 60 + }, + "306:10": { "id:3": 805049422, "sizeX:3": 24, "sizeY:3": 24, "x:3": 48, "y:3": -180 }, - "304:10": { + "307:10": { "id:3": 807924350, "sizeX:3": 24, "sizeY:3": 24, "x:3": 48, "y:3": -492 }, - "305:10": { + "308:10": { "id:3": 810176091, "sizeX:3": 24, "sizeY:3": 24, "x:3": 72, "y:3": -468 }, - "306:10": { + "309:10": { "id:3": 850659984, "sizeX:3": 24, "sizeY:3": 24, "x:3": -456, "y:3": 36 }, - "307:10": { + "310:10": { "id:3": 871786931, "sizeX:3": 24, "sizeY:3": 24, "x:3": 24, "y:3": -468 }, - "308:10": { + "311:10": { "id:3": 984531997, "sizeX:3": 24, "sizeY:3": 24, "x:3": 24, "y:3": -516 }, - "309:10": { + "312:10": { "id:3": 1053008472, "sizeX:3": 24, "sizeY:3": 24, "x:3": 72, "y:3": -348 }, - "310:10": { + "313:10": { "id:3": 1302355832, "sizeX:3": 24, "sizeY:3": 24, "x:3": -48, "y:3": -252 }, - "311:10": { + "314:10": { "id:3": 1326761132, "sizeX:3": 24, "sizeY:3": 24, "x:3": 24, "y:3": -324 }, - "312:10": { + "315:10": { "id:3": 1370359542, "sizeX:3": 24, "sizeY:3": 24, "x:3": 48, "y:3": -300 }, - "313:10": { + "316:10": { "id:3": 1461929411, "sizeX:3": 24, "sizeY:3": 24, "x:3": 72, "y:3": -324 }, - "314:10": { + "317:10": { "id:3": 1494150833, "sizeX:3": 24, "sizeY:3": 24, "x:3": 24, "y:3": -300 }, - "315:10": { + "318:10": { "id:3": 1567883667, "sizeX:3": 24, "sizeY:3": 24, "x:3": 264, "y:3": -96 }, - "316:10": { + "319:10": { "id:3": 1837024033, "sizeX:3": 24, "sizeY:3": 24, "x:3": 48, "y:3": -324 }, - "317:10": { + "320:10": { "id:3": 1907230724, "sizeX:3": 24, "sizeY:3": 24, "x:3": 24, "y:3": -492 }, - "318:10": { + "321:10": { "id:3": 1913343585, "sizeX:3": 24, "sizeY:3": 24, "x:3": 24, "y:3": -348 }, - "319:10": { + "322:10": { "id:3": 2034373847, "sizeX:3": 24, "sizeY:3": 24, diff --git a/config/betterquesting/DefaultQuests/QuestLines/5.json b/config/betterquesting/DefaultQuests/QuestLines/5.json index c195646d..3653b645 100644 --- a/config/betterquesting/DefaultQuests/QuestLines/5.json +++ b/config/betterquesting/DefaultQuests/QuestLines/5.json @@ -3149,90 +3149,111 @@ "y:3": -264 }, "448:10": { + "id:3": 736384140, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": 540, + "y:3": -444 + }, + "449:10": { "id:3": 795857967, "sizeX:3": 24, "sizeY:3": 24, "x:3": -252, "y:3": 60 }, - "449:10": { + "450:10": { + "id:3": 949656804, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": 504, + "y:3": -444 + }, + "451:10": { "id:3": 1031147864, "sizeX:3": 24, "sizeY:3": 24, "x:3": 72, "y:3": -156 }, - "450:10": { + "452:10": { "id:3": 1083627567, "sizeX:3": 24, "sizeY:3": 24, "x:3": 576, "y:3": -264 }, - "451:10": { + "453:10": { + "id:3": 1091209787, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": 432, + "y:3": -480 + }, + "454:10": { "id:3": 1272834460, "sizeX:3": 24, "sizeY:3": 24, "x:3": 576, "y:3": -300 }, - "452:10": { + "455:10": { "id:3": 1304340834, "sizeX:3": 24, "sizeY:3": 24, "x:3": 540, "y:3": -264 }, - "453:10": { + "456:10": { "id:3": 1365120258, "sizeX:3": 24, "sizeY:3": 24, "x:3": 612, "y:3": 24 }, - "454:10": { + "457:10": { "id:3": 1403757701, "sizeX:3": 24, "sizeY:3": 24, "x:3": 72, "y:3": -228 }, - "455:10": { + "458:10": { "id:3": 1430343507, "sizeX:3": 24, "sizeY:3": 24, "x:3": 72, "y:3": -192 }, - "456:10": { + "459:10": { "id:3": 1453897011, "sizeX:3": 24, "sizeY:3": 24, "x:3": 108, "y:3": 132 }, - "457:10": { + "460:10": { "id:3": 1553598788, "sizeX:3": 24, "sizeY:3": 24, "x:3": 540, "y:3": -300 }, - "458:10": { + "461:10": { "id:3": 1596066184, "sizeX:3": 24, "sizeY:3": 24, "x:3": 108, "y:3": -156 }, - "459:10": { + "462:10": { "id:3": 1799610165, "sizeX:3": 24, "sizeY:3": 24, "x:3": -180, "y:3": 60 }, - "460:10": { + "463:10": { "id:3": 2087826195, "sizeX:3": 24, "sizeY:3": 24, diff --git a/config/betterquesting/DefaultQuests/QuestSettings.json b/config/betterquesting/DefaultQuests/QuestSettings.json index baa61506..f2552c76 100644 --- a/config/betterquesting/DefaultQuests/QuestSettings.json +++ b/config/betterquesting/DefaultQuests/QuestSettings.json @@ -1,7 +1,8 @@ { "betterquesting:10": { "editmode:1": 0, - "home_image:8": "meatballcraft:textures/gui/title_card.png", + "home_image:8": "meatballcraft:textures/gui/default_title.png", + "home_offset_y:3": 155, "pack_name:8": "Meatballcraft" }, "format:8": "2.1.0" diff --git a/config/betterquesting/DefaultQuests/Quests/0/0.json b/config/betterquesting/DefaultQuests/Quests/0/0.json index 7b75255e..ee267b0f 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/0.json +++ b/config/betterquesting/DefaultQuests/Quests/0/0.json @@ -41,19 +41,6 @@ } }, "2:10": { - "Count:3": 1, - "id:8": "minecraft:written_book", - "tag:10": { - "author:8": "Meatballcraft", - "pages:9": { - "0:8": "{\"text\":\"为了优化游戏在不同硬件平台上的性能表现，部分游戏内动画（例如火焰）默认为关闭状态。\\n\\n查看下一页\"}", - "1:8": "{\"text\":\"我知道有些玩家很在乎视觉体验。\\n\\n要重新启用这些动画，将AlternativeConfigs目录下的loliasm.cfg文件复制到config目录下。\\n\\n查看下一页\"}", - "2:8": "{\"text\":\"警告：这样可能会影响性能表现，甚至可能完全玩不了。\"}" - }, - "title:8": "没有动画" - } - }, - "3:10": { "Count:3": 1, "id:8": "minecraft:written_book", "tag:10": { diff --git a/config/betterquesting/DefaultQuests/Quests/0/1111658403.json b/config/betterquesting/DefaultQuests/Quests/0/1111658403.json index 14116701..59539347 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/1111658403.json +++ b/config/betterquesting/DefaultQuests/Quests/0/1111658403.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "", "icon:10": { "Count:3": 1, "id:8": "forge:bucketfilled", @@ -13,7 +13,7 @@ "FluidName:8": "whisper_of_donaeth_rusen" } }, - "name:8": "New Quest" + "name:8": "来自丹奈斯・鲁森的明信片" } }, "questID:3": 1111658403, diff --git a/config/betterquesting/DefaultQuests/Quests/0/1197.json b/config/betterquesting/DefaultQuests/Quests/0/1197.json index 962e86f5..e2048fdd 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/1197.json +++ b/config/betterquesting/DefaultQuests/Quests/0/1197.json @@ -25,7 +25,6 @@ "TrophyColorBlue:3": 0, "TrophyColorGreen:3": 0, "TrophyColorRed:3": 0, - "TrophyEarnedAt:4": 1728496836, "TrophyItem:10": { "Count:1": 1, "Damage:2": 0, diff --git a/config/betterquesting/DefaultQuests/Quests/0/1230893198.json b/config/betterquesting/DefaultQuests/Quests/0/1230893198.json index bdd09c38..39922daf 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/1230893198.json +++ b/config/betterquesting/DefaultQuests/Quests/0/1230893198.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "", "icon:10": { "Count:3": 1, "id:8": "forge:bucketfilled", @@ -13,7 +13,7 @@ "FluidName:8": "whisper_of_kurald_emurlahn" } }, - "name:8": "New Quest" + "name:8": "来自库拉德・暗穆兰的明信片" } }, "questID:3": 1230893198, diff --git a/config/betterquesting/DefaultQuests/Quests/0/1248230501.json b/config/betterquesting/DefaultQuests/Quests/0/1248230501.json new file mode 100644 index 00000000..aa54b1ef --- /dev/null +++ b/config/betterquesting/DefaultQuests/Quests/0/1248230501.json @@ -0,0 +1,53 @@ +{ + "preRequisites:11": [ + 152 + ], + "properties:10": { + "betterquesting:10": { + "desc:8": "§7§oRockets and space stations are cool, but unfortunately sometimes they bug out.\nFor those that do not want to deal with the possible issues from using Advanced Rocketry, there\u0027s the Bee Stargate!\n\n§fWow, of course Bees have developed extremely advanced Wormhole technology. I love the Bees!\nStepping through a Stargate, that feels quite cool, I will not deny it...\nIt seems like these structures play an important role in the history, tradition, and culture of Bees. Those that are capable of producing components for these Stargates appear to be highly regarded by the rest of the Bees. This reminds me of how priests and monks are treated by humans. I wonder if their religion has something to do with Stargates...", + "icon:10": { + "Count:3": 1, + "id:8": "contenttweaker:bee_stargate" + }, + "name:8": "The Bee Stargate" + } + }, + "questID:3": 1248230501, + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "contenttweaker:stargate_sand" + }, + "1:10": { + "Count:3": 1, + "id:8": "contenttweaker:stargate_chevron_block" + }, + "2:10": { + "Count:3": 1, + "id:8": "contenttweaker:stargate_ring_block" + }, + "3:10": { + "Count:3": 1, + "id:8": "contenttweaker:stargate_controller_block" + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "modularmachinery:itemblueprint", + "tag:10": { + "dynamicmachine:8": "modularmachinery:bee_stargate" + } + } + }, + "taskID:8": "bq_standard:optional_retrieval" + } + } +} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/0/1283790114.json b/config/betterquesting/DefaultQuests/Quests/0/1283790114.json index 49d787e4..55486fa8 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/1283790114.json +++ b/config/betterquesting/DefaultQuests/Quests/0/1283790114.json @@ -25,7 +25,6 @@ "TrophyColorBlue:3": 0, "TrophyColorGreen:3": 100, "TrophyColorRed:3": 100, - "TrophyEarnedAt:4": 1727205582, "TrophyItem:10": { "Count:1": 1, "Damage:2": 0, diff --git a/config/betterquesting/DefaultQuests/Quests/0/1342545885.json b/config/betterquesting/DefaultQuests/Quests/0/1342545885.json index 6651c13d..94bb8bb6 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/1342545885.json +++ b/config/betterquesting/DefaultQuests/Quests/0/1342545885.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "", "icon:10": { "Count:3": 1, "id:8": "forge:bucketfilled", @@ -13,7 +13,7 @@ "FluidName:8": "whisper_of_omtose_phellack" } }, - "name:8": "New Quest" + "name:8": "来自欧姆托斯・费拉克的明信片" } }, "questID:3": 1342545885, diff --git a/config/betterquesting/DefaultQuests/Quests/0/1455291383.json b/config/betterquesting/DefaultQuests/Quests/0/1455291383.json index 74df43b4..77e0375b 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/1455291383.json +++ b/config/betterquesting/DefaultQuests/Quests/0/1455291383.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "", "icon:10": { "Count:3": 1, "id:8": "forge:bucketfilled", @@ -13,7 +13,7 @@ "FluidName:8": "whisper_of_kurald_thyrllan" } }, - "name:8": "New Quest" + "name:8": "来自库拉德・泰尔兰的明信片" } }, "questID:3": 1455291383, diff --git a/config/betterquesting/DefaultQuests/Quests/0/1501755393.json b/config/betterquesting/DefaultQuests/Quests/0/1501755393.json index 2a352e64..6494b27f 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/1501755393.json +++ b/config/betterquesting/DefaultQuests/Quests/0/1501755393.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "", "icon:10": { "Count:3": 1, "id:8": "forge:bucketfilled", @@ -13,7 +13,7 @@ "FluidName:8": "whisper_of_kurald_galain" } }, - "name:8": "New Quest" + "name:8": "来自库拉德・加莱的明信片" } }, "questID:3": 1501755393, diff --git a/config/betterquesting/DefaultQuests/Quests/0/1521131802.json b/config/betterquesting/DefaultQuests/Quests/0/1521131802.json index efd02334..31beb631 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/1521131802.json +++ b/config/betterquesting/DefaultQuests/Quests/0/1521131802.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "", "icon:10": { "Count:3": 1, "id:8": "forge:bucketfilled", @@ -13,7 +13,7 @@ "FluidName:8": "whisper_of_ahkrast_korvalain" } }, - "name:8": "New Quest" + "name:8": "来自阿克拉斯特・科瓦莱恩的明信片" } }, "questID:3": 1521131802, diff --git a/config/betterquesting/DefaultQuests/Quests/0/1597993732.json b/config/betterquesting/DefaultQuests/Quests/0/1597993732.json index 177bd57f..cea4c25d 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/1597993732.json +++ b/config/betterquesting/DefaultQuests/Quests/0/1597993732.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "§7§o空间站和跃迁引擎多方块结构用于航行至多个不同星球（查看后续任务）。\n\n高级火箭模组处理起来可能有一点麻烦，所以我提供了可选的跃迁器配方。这些跃迁器必须在空间站内使用，所以你还是得往轨道上拍一个空间站。", + "desc:8": "§7§o空间站和跃迁引擎多方块结构用于航行至多个不同星球（查看上方任务）。\n\n", "icon:10": { "Count:3": 1, "id:8": "contenttweaker:infused_sol_stone" @@ -23,16 +23,5 @@ } }, "taskID:8": "bq_standard:retrieval" - }, - "1:10": { - "index:3": 1, - "requiredItems:9": { - "0:10": { - "Count:3": 1, - "id:8": "contenttweaker:bee_stargate" - } - }, - "taskID:8": "bq_standard:optional_retrieval" } - } -} \ No newline at end of file + } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/0/1647333921.json b/config/betterquesting/DefaultQuests/Quests/0/1647333921.json new file mode 100644 index 00000000..c76711e0 --- /dev/null +++ b/config/betterquesting/DefaultQuests/Quests/0/1647333921.json @@ -0,0 +1,49 @@ +{ + "preRequisites:11": [ + 198 + ], + "properties:10": { + "betterquesting:10": { + "desc:8": "", + "icon:10": { + "Count:3": 1, + "id:8": "forge:bucketfilled", + "tag:10": { + "Amount:3": 1000, + "FluidName:8": "bewitched_essence_salts" + } + }, + "name:8": "巫师之盐" + } + }, + "questID:3": 1647333921, + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "forge:bucketfilled", + "tag:10": { + "Amount:3": 1000, + "FluidName:8": "bewitched_essence_salts" + } + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "modularmachinery:itemblueprint", + "tag:10": { + "dynamicmachine:8": "modularmachinery:xp_assimilator" + } + } + }, + "taskID:8": "bq_standard:optional_retrieval" + } + } +} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/0/1727374336.json b/config/betterquesting/DefaultQuests/Quests/0/1727374336.json index bc8354bd..507b1457 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/1727374336.json +++ b/config/betterquesting/DefaultQuests/Quests/0/1727374336.json @@ -4,12 +4,12 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "", + "desc:8": "§7§oNerdySpider负责了第10章的绝大部分纹理！非常感谢！", "icon:10": { "Count:3": 1, "id:8": "contenttweaker:warren_creation_fabrial" }, - "name:8": "Kashan, the Warren of Actualization" + "name:8": "卡尚，显化之迷道" } }, "questID:3": 1727374336, diff --git a/config/betterquesting/DefaultQuests/Quests/0/174.json b/config/betterquesting/DefaultQuests/Quests/0/174.json index e3a6c6dc..bd0ed6e8 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/174.json +++ b/config/betterquesting/DefaultQuests/Quests/0/174.json @@ -36,9 +36,26 @@ "0:10": { "Count:3": 1, "id:8": "contenttweaker:taerrapiatta_warper" + }, + "1:10": { + "Count:3": 1, + "id:8": "contenttweaker:wormhole_field_module" } }, "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "modularmachinery:itemblueprint", + "tag:10": { + "dynamicmachine:8": "modularmachinery:wormhole_field_generator" + } + } + }, + "taskID:8": "bq_standard:optional_retrieval" } } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/0/176.json b/config/betterquesting/DefaultQuests/Quests/0/176.json index d628d0ba..45c7e373 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/176.json +++ b/config/betterquesting/DefaultQuests/Quests/0/176.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "§7§o自动化神圣RPG和虚无世界模组的矿物！（当然不是唯一的方法……）\n\n§f泰拉上的鸡与虽能与各类物质共鸣，但实际使用时却相当有局限性。\n不过借助星辉魔法的改造，我可以培育出改良版本的鸡！\n终于不用为寻找[虚无]蓝宝石发愁了！", + "desc:8": "§7§o自动化神圣RPG和虚无世界模组的矿物！（当然不是唯一的方法……）\n\n§f泰拉上的鸡与虽能与各类物质共鸣，但实际使用时却相当有局限性。\n不过借助星辉魔法的改造，我可以培育出改良版本的鸡！\n终于不用为寻找[飞升]蓝宝石发愁了！", "icon:10": { "Count:3": 1, "id:8": "contenttweaker:resplendent_ingot" diff --git a/config/betterquesting/DefaultQuests/Quests/0/1836563922.json b/config/betterquesting/DefaultQuests/Quests/0/1836563922.json index d7e60e70..c9356eaa 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/1836563922.json +++ b/config/betterquesting/DefaultQuests/Quests/0/1836563922.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "", + "desc:8": "§7§oCongratulations! You reached the canon ending for the modpack! \nIf you still crave some more, you can reach alternative endings by completing some side quests in this chapter!", "frame:8": "STAR4_ON_DIAGONAL_STAR4", "icon:10": { "Count:3": 1, diff --git a/config/betterquesting/DefaultQuests/Quests/0/189570972.json b/config/betterquesting/DefaultQuests/Quests/0/189570972.json new file mode 100644 index 00000000..0cd0c6f8 --- /dev/null +++ b/config/betterquesting/DefaultQuests/Quests/0/189570972.json @@ -0,0 +1,28 @@ +{ + "preRequisites:11": [ + 2268 + ], + "properties:10": { + "betterquesting:10": { + "desc:8": "", + "icon:10": { + "Count:3": 1, + "id:8": "contenttweaker:lively_tree_callstone" + }, + "name:8": "Lively Tree is Lively" + } + }, + "questID:3": 189570972, + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "contenttweaker:lively_tree_callstone" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } +} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/0/2044693951.json b/config/betterquesting/DefaultQuests/Quests/0/2044693951.json index 1f04c883..82635681 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/2044693951.json +++ b/config/betterquesting/DefaultQuests/Quests/0/2044693951.json @@ -28,7 +28,6 @@ "TrophyColorBlue:3": 0, "TrophyColorGreen:3": 0, "TrophyColorRed:3": 0, - "TrophyEarnedAt:4": 1727129438, "TrophyItem:10": { "Count:1": 1, "Damage:2": 0, diff --git a/config/betterquesting/DefaultQuests/Quests/0/262948337.json b/config/betterquesting/DefaultQuests/Quests/0/262948337.json index f03a79ad..6075151d 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/262948337.json +++ b/config/betterquesting/DefaultQuests/Quests/0/262948337.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "", "icon:10": { "Count:3": 1, "id:8": "forge:bucketfilled", @@ -13,7 +13,7 @@ "FluidName:8": "whisper_of_tellan" } }, - "name:8": "New Quest" + "name:8": "来自泰兰的明信片" } }, "questID:3": 262948337, diff --git a/config/betterquesting/DefaultQuests/Quests/0/327.json b/config/betterquesting/DefaultQuests/Quests/0/327.json index 04429c76..ea775604 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/327.json +++ b/config/betterquesting/DefaultQuests/Quests/0/327.json @@ -47,16 +47,6 @@ } }, "taskID:8": "bq_standard:retrieval" - }, - "1:10": { - "index:3": 1, - "requiredItems:9": { - "0:10": { - "Count:3": 1, - "id:8": "aoa3:distorting_artifact" - } - }, - "taskID:8": "bq_standard:optional_retrieval" } } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/0/330.json b/config/betterquesting/DefaultQuests/Quests/0/330.json index 4e1de08c..b3650b35 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/330.json +++ b/config/betterquesting/DefaultQuests/Quests/0/330.json @@ -39,6 +39,16 @@ } }, "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "aoa3:distorting_artifact" + } + }, + "taskID:8": "bq_standard:optional_retrieval" } } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/0/331342148.json b/config/betterquesting/DefaultQuests/Quests/0/331342148.json index a7c22029..92accc6f 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/331342148.json +++ b/config/betterquesting/DefaultQuests/Quests/0/331342148.json @@ -15,7 +15,7 @@ "Lore:9": { "0:8": "§d§o超限附魔§r" }, - "Name:8": "§6§oDragnipur§r" + "Name:8": "§6§o噬灵者§r" }, "ench:9": { "0:10": { @@ -41,7 +41,7 @@ } } }, - "name:8": "Warren Whisperer" + "name:8": "艾兰特" } }, "questID:3": 331342148, diff --git a/config/betterquesting/DefaultQuests/Quests/0/609304222.json b/config/betterquesting/DefaultQuests/Quests/0/609304222.json index dba03a10..560fb503 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/609304222.json +++ b/config/betterquesting/DefaultQuests/Quests/0/609304222.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "", "icon:10": { "Count:3": 1, "id:8": "forge:bucketfilled", @@ -13,7 +13,7 @@ "FluidName:8": "whisper_of_starvald_demelain" } }, - "name:8": "New Quest" + "name:8": "来自斯塔沃・德梅兰的明信片" } }, "questID:3": 609304222, diff --git a/config/betterquesting/DefaultQuests/Quests/0/813659679.json b/config/betterquesting/DefaultQuests/Quests/0/813659679.json index 19e8e7a0..15948466 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/813659679.json +++ b/config/betterquesting/DefaultQuests/Quests/0/813659679.json @@ -7,9 +7,9 @@ "desc:8": "", "icon:10": { "Count:3": 1, - "id:8": "contenttweaker:eleint_stone" + "id:8": "contenttweaker:power_wrought_brightsteel_alloy_plate" }, - "name:8": "The Eleint" + "name:8": "The Power" } }, "questID:3": 813659679, @@ -19,7 +19,7 @@ "requiredItems:9": { "0:10": { "Count:3": 1, - "id:8": "contenttweaker:eleint_stone" + "id:8": "contenttweaker:power_wrought_brightsteel_alloy_plate" } }, "taskID:8": "bq_standard:retrieval" diff --git a/config/betterquesting/DefaultQuests/Quests/0/814979819.json b/config/betterquesting/DefaultQuests/Quests/0/814979819.json index a120fba8..94a3a4a2 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/814979819.json +++ b/config/betterquesting/DefaultQuests/Quests/0/814979819.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "", "icon:10": { "Count:3": 1, "id:8": "forge:bucketfilled", @@ -13,7 +13,7 @@ "FluidName:8": "whisper_of_verdith_anath" } }, - "name:8": "New Quest" + "name:8": "来自维狄萨斯・安纳斯的明信片" } }, "questID:3": 814979819, diff --git a/config/betterquesting/DefaultQuests/Quests/0/946686645.json b/config/betterquesting/DefaultQuests/Quests/0/946686645.json index 7fdc2059..004439c6 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/946686645.json +++ b/config/betterquesting/DefaultQuests/Quests/0/946686645.json @@ -25,7 +25,6 @@ "TrophyColorBlue:3": 1, "TrophyColorGreen:3": 1, "TrophyColorRed:3": 1, - "TrophyEarnedAt:4": 1726529097, "TrophyItem:10": { "Count:1": 1, "Damage:2": 0, diff --git a/config/betterquesting/DefaultQuests/Quests/0/970927034.json b/config/betterquesting/DefaultQuests/Quests/0/970927034.json index d0a81656..5b38adc2 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/970927034.json +++ b/config/betterquesting/DefaultQuests/Quests/0/970927034.json @@ -13,7 +13,7 @@ "FluidName:8": "whisper_of_thel" } }, - "name:8": "New Quest" + "name:8": "来自瑟尔的明信片" } }, "questID:3": 970927034, diff --git a/config/betterquesting/DefaultQuests/Quests/10/342.json b/config/betterquesting/DefaultQuests/Quests/10/342.json index 3deff362..37531410 100644 --- a/config/betterquesting/DefaultQuests/Quests/10/342.json +++ b/config/betterquesting/DefaultQuests/Quests/10/342.json @@ -16,7 +16,7 @@ "FluidName:8": "caesium" } }, - "name:8": "Cesium" + "name:8": "铯" } }, "questID:3": 342, diff --git a/config/betterquesting/DefaultQuests/Quests/3/400947744.json b/config/betterquesting/DefaultQuests/Quests/3/400947744.json new file mode 100644 index 00000000..8d1ca75f --- /dev/null +++ b/config/betterquesting/DefaultQuests/Quests/3/400947744.json @@ -0,0 +1,34 @@ +{ + "preRequisites:11": [ + 893 + ], + "properties:10": { + "betterquesting:10": { + "desc:8": "", + "icon:10": { + "Count:3": 1, + "id:8": "modularmachinery:itemblueprint", + "tag:10": { + "dynamicmachine:8": "modularmachinery:wormhole_field_generator" + } + }, + "name:8": "虫洞场发生器" + } + }, + "questID:3": 400947744, + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "modularmachinery:itemblueprint", + "tag:10": { + "dynamicmachine:8": "modularmachinery:wormhole_field_generator" + } + } + }, + "taskID:8": "bq_standard:retrieval" + } + } +} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/3/746862659.json b/config/betterquesting/DefaultQuests/Quests/3/746862659.json new file mode 100644 index 00000000..c20ea852 --- /dev/null +++ b/config/betterquesting/DefaultQuests/Quests/3/746862659.json @@ -0,0 +1,34 @@ +{ + "preRequisites:11": [ + 893 + ], + "properties:10": { + "betterquesting:10": { + "desc:8": "", + "icon:10": { + "Count:3": 1, + "id:8": "modularmachinery:itemblueprint", + "tag:10": { + "dynamicmachine:8": "modularmachinery:bee_stargate" + } + }, + "name:8": "蜜蜂星门" + } + }, + "questID:3": 746862659, + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "modularmachinery:itemblueprint", + "tag:10": { + "dynamicmachine:8": "modularmachinery:bee_stargate" + } + } + }, + "taskID:8": "bq_standard:retrieval" + } + } +} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/3/804922623.json b/config/betterquesting/DefaultQuests/Quests/3/804922623.json new file mode 100644 index 00000000..e4f2fbdd --- /dev/null +++ b/config/betterquesting/DefaultQuests/Quests/3/804922623.json @@ -0,0 +1,34 @@ +{ + "preRequisites:11": [ + 20538 + ], + "properties:10": { + "betterquesting:10": { + "desc:8": "", + "icon:10": { + "Count:3": 1, + "id:8": "modularmachinery:itemblueprint", + "tag:10": { + "dynamicmachine:8": "modularmachinery:xp_assimilator" + } + }, + "name:8": "经验浴池" + } + }, + "questID:3": 804922623, + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "modularmachinery:itemblueprint", + "tag:10": { + "dynamicmachine:8": "modularmachinery:xp_assimilator" + } + } + }, + "taskID:8": "bq_standard:retrieval" + } + } +} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/5/1091209787.json b/config/betterquesting/DefaultQuests/Quests/5/1091209787.json new file mode 100644 index 00000000..822371e8 --- /dev/null +++ b/config/betterquesting/DefaultQuests/Quests/5/1091209787.json @@ -0,0 +1,315 @@ +{ + "preRequisites:11": [ + 1253, + 585706829 + ], + "properties:10": { + "betterquesting:10": { + "desc:8": "", + "icon:10": { + "Count:3": 1, + "id:8": "forestry:bee_queen_ge", + "tag:10": { + "Genome:10": { + "Chromosomes:9": { + "0:10": { + "Slot:1": 0, + "UID0:8": "gendustry.bee.UniversalConstellation", + "UID1:8": "gendustry.bee.UniversalConstellation" + }, + "1:10": { + "Slot:1": 1, + "UID0:8": "forestry.speedSlow", + "UID1:8": "forestry.speedSlow" + }, + "2:10": { + "Slot:1": 2, + "UID0:8": "forestry.lifespanShort", + "UID1:8": "forestry.lifespanShort" + }, + "3:10": { + "Slot:1": 3, + "UID0:8": "forestry.fertilityNormal", + "UID1:8": "forestry.fertilityNormal" + }, + "4:10": { + "Slot:1": 4, + "UID0:8": "forestry.toleranceDown2", + "UID1:8": "forestry.toleranceDown2" + }, + "5:10": { + "Slot:1": 5, + "UID0:8": "forestry.boolTrue", + "UID1:8": "forestry.boolTrue" + }, + "6:10": { + "Slot:1": 6, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "7:10": { + "Slot:1": 7, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "8:10": { + "Slot:1": 8, + "UID0:8": "forestry.boolTrue", + "UID1:8": "forestry.boolTrue" + }, + "9:10": { + "Slot:1": 9, + "UID0:8": "forestry.flowersNether", + "UID1:8": "forestry.flowersNether" + }, + "10:10": { + "Slot:1": 10, + "UID0:8": "forestry.floweringSlowest", + "UID1:8": "forestry.floweringSlowest" + }, + "11:10": { + "Slot:1": 11, + "UID0:8": "forestry.territoryAverage", + "UID1:8": "forestry.territoryAverage" + }, + "12:10": { + "Slot:1": 12, + "UID0:8": "forestry.effectAggressive", + "UID1:8": "forestry.effectAggressive" + } + } + }, + "Health:3": 30, + "IsAnalyzed:1": 0, + "Mate:10": { + "Chromosomes:9": { + "0:10": { + "Slot:1": 0, + "UID0:8": "gendustry.bee.UniversalConstellation", + "UID1:8": "gendustry.bee.UniversalConstellation" + }, + "1:10": { + "Slot:1": 1, + "UID0:8": "forestry.speedSlow", + "UID1:8": "forestry.speedSlow" + }, + "2:10": { + "Slot:1": 2, + "UID0:8": "forestry.lifespanShort", + "UID1:8": "forestry.lifespanShort" + }, + "3:10": { + "Slot:1": 3, + "UID0:8": "forestry.fertilityNormal", + "UID1:8": "forestry.fertilityNormal" + }, + "4:10": { + "Slot:1": 4, + "UID0:8": "forestry.toleranceDown2", + "UID1:8": "forestry.toleranceDown2" + }, + "5:10": { + "Slot:1": 5, + "UID0:8": "forestry.boolTrue", + "UID1:8": "forestry.boolTrue" + }, + "6:10": { + "Slot:1": 6, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "7:10": { + "Slot:1": 7, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "8:10": { + "Slot:1": 8, + "UID0:8": "forestry.boolTrue", + "UID1:8": "forestry.boolTrue" + }, + "9:10": { + "Slot:1": 9, + "UID0:8": "forestry.flowersNether", + "UID1:8": "forestry.flowersNether" + }, + "10:10": { + "Slot:1": 10, + "UID0:8": "forestry.floweringSlowest", + "UID1:8": "forestry.floweringSlowest" + }, + "11:10": { + "Slot:1": 11, + "UID0:8": "forestry.territoryAverage", + "UID1:8": "forestry.territoryAverage" + }, + "12:10": { + "Slot:1": 12, + "UID0:8": "forestry.effectAggressive", + "UID1:8": "forestry.effectAggressive" + } + } + }, + "MaxH:3": 30 + } + }, + "name:8": "宇宙星座蜜蜂" + } + }, + "questID:3": 1091209787, + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "forestry:bee_queen_ge", + "tag:10": { + "Genome:10": { + "Chromosomes:9": { + "0:10": { + "Slot:1": 0, + "UID0:8": "gendustry.bee.UniversalConstellation", + "UID1:8": "gendustry.bee.UniversalConstellation" + }, + "1:10": { + "Slot:1": 1, + "UID0:8": "forestry.speedSlow", + "UID1:8": "forestry.speedSlow" + }, + "2:10": { + "Slot:1": 2, + "UID0:8": "forestry.lifespanShort", + "UID1:8": "forestry.lifespanShort" + }, + "3:10": { + "Slot:1": 3, + "UID0:8": "forestry.fertilityNormal", + "UID1:8": "forestry.fertilityNormal" + }, + "4:10": { + "Slot:1": 4, + "UID0:8": "forestry.toleranceDown2", + "UID1:8": "forestry.toleranceDown2" + }, + "5:10": { + "Slot:1": 5, + "UID0:8": "forestry.boolTrue", + "UID1:8": "forestry.boolTrue" + }, + "6:10": { + "Slot:1": 6, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "7:10": { + "Slot:1": 7, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "8:10": { + "Slot:1": 8, + "UID0:8": "forestry.boolTrue", + "UID1:8": "forestry.boolTrue" + }, + "9:10": { + "Slot:1": 9, + "UID0:8": "forestry.flowersNether", + "UID1:8": "forestry.flowersNether" + }, + "10:10": { + "Slot:1": 10, + "UID0:8": "forestry.floweringSlowest", + "UID1:8": "forestry.floweringSlowest" + }, + "11:10": { + "Slot:1": 11, + "UID0:8": "forestry.territoryAverage", + "UID1:8": "forestry.territoryAverage" + }, + "12:10": { + "Slot:1": 12, + "UID0:8": "forestry.effectAggressive", + "UID1:8": "forestry.effectAggressive" + } + } + }, + "Health:3": 30, + "IsAnalyzed:1": 0, + "Mate:10": { + "Chromosomes:9": { + "0:10": { + "Slot:1": 0, + "UID0:8": "gendustry.bee.UniversalConstellation", + "UID1:8": "gendustry.bee.UniversalConstellation" + }, + "1:10": { + "Slot:1": 1, + "UID0:8": "forestry.speedSlow", + "UID1:8": "forestry.speedSlow" + }, + "2:10": { + "Slot:1": 2, + "UID0:8": "forestry.lifespanShort", + "UID1:8": "forestry.lifespanShort" + }, + "3:10": { + "Slot:1": 3, + "UID0:8": "forestry.fertilityNormal", + "UID1:8": "forestry.fertilityNormal" + }, + "4:10": { + "Slot:1": 4, + "UID0:8": "forestry.toleranceDown2", + "UID1:8": "forestry.toleranceDown2" + }, + "5:10": { + "Slot:1": 5, + "UID0:8": "forestry.boolTrue", + "UID1:8": "forestry.boolTrue" + }, + "6:10": { + "Slot:1": 6, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "7:10": { + "Slot:1": 7, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "8:10": { + "Slot:1": 8, + "UID0:8": "forestry.boolTrue", + "UID1:8": "forestry.boolTrue" + }, + "9:10": { + "Slot:1": 9, + "UID0:8": "forestry.flowersNether", + "UID1:8": "forestry.flowersNether" + }, + "10:10": { + "Slot:1": 10, + "UID0:8": "forestry.floweringSlowest", + "UID1:8": "forestry.floweringSlowest" + }, + "11:10": { + "Slot:1": 11, + "UID0:8": "forestry.territoryAverage", + "UID1:8": "forestry.territoryAverage" + }, + "12:10": { + "Slot:1": 12, + "UID0:8": "forestry.effectAggressive", + "UID1:8": "forestry.effectAggressive" + } + } + }, + "MaxH:3": 30 + } + } + }, + "taskID:8": "bq_standard:retrieval" + } + } +} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/5/1525.json b/config/betterquesting/DefaultQuests/Quests/5/1525.json index b0a7340a..a428621d 100644 --- a/config/betterquesting/DefaultQuests/Quests/5/1525.json +++ b/config/betterquesting/DefaultQuests/Quests/5/1525.json @@ -14,7 +14,7 @@ } } }, - "name:8": "[虚无]紫晶" + "name:8": "[飞升]紫晶" } }, "questID:3": 1525, diff --git a/config/betterquesting/DefaultQuests/Quests/5/1530.json b/config/betterquesting/DefaultQuests/Quests/5/1530.json index 0c03db9f..feeda85c 100644 --- a/config/betterquesting/DefaultQuests/Quests/5/1530.json +++ b/config/betterquesting/DefaultQuests/Quests/5/1530.json @@ -14,7 +14,7 @@ } } }, - "name:8": "[虚无]翡翠" + "name:8": "[飞升]翡翠" } }, "questID:3": 1530, diff --git a/config/betterquesting/DefaultQuests/Quests/5/1533.json b/config/betterquesting/DefaultQuests/Quests/5/1533.json index 1b0f6be2..3e4a35cc 100644 --- a/config/betterquesting/DefaultQuests/Quests/5/1533.json +++ b/config/betterquesting/DefaultQuests/Quests/5/1533.json @@ -14,7 +14,7 @@ } } }, - "name:8": "[虚无]蓝宝石" + "name:8": "[飞升]蓝宝石" } }, "questID:3": 1533, diff --git a/config/betterquesting/DefaultQuests/Quests/5/20466.json b/config/betterquesting/DefaultQuests/Quests/5/20466.json index 5cd264cc..8d924aa1 100644 --- a/config/betterquesting/DefaultQuests/Quests/5/20466.json +++ b/config/betterquesting/DefaultQuests/Quests/5/20466.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "§7§o石精华和下界精华可用于制作拥有神话性质的矿物。\n\n一份矿物可制成一块矿石……\n\n一块矿石能产出多份矿物，特别是在工业磨粉机中！\n\n可循环进行这一过程以实现产量的指数增长（前提是有足量的精华）。\n\n适用矿物类型：卢比、阿勒石、现石、玫石、褐铁、炎岩、血宝石、余烬石。", + "desc:8": "§7§o石精华和下界精华可用于制作拥有神话性质的矿物。\n\n一份矿物可制成一块矿石……\n\n一块矿石能产出多份矿物，特别是在工业磨粉机中！\n\n可循环进行这一过程以实现产量的指数增长（前提是有足量的精华）。\n\n适用矿物类型：卢比、阿勒石、现石、玫石、褐铁、炎岩、血宝石、余烬石、符文、[飞升]翡翠、[飞升]蓝宝石、[飞升]紫晶。", "icon:10": { "Count:3": 1, "id:8": "mysticalagriculture:stone_essence" diff --git a/config/betterquesting/DefaultQuests/Quests/5/2108.json b/config/betterquesting/DefaultQuests/Quests/5/2108.json index 27e166c9..fda9214a 100644 --- a/config/betterquesting/DefaultQuests/Quests/5/2108.json +++ b/config/betterquesting/DefaultQuests/Quests/5/2108.json @@ -5,7 +5,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "§7§o完成药剂师监狱钥匙谜题。", + "desc:8": "§7§o完成药师监狱钥匙谜题。", "icon:10": { "Count:3": 1, "id:8": "forestry:bee_queen_ge", @@ -153,7 +153,7 @@ "MaxH:3": 50 } }, - "name:8": "药剂师蜜蜂" + "name:8": "药师蜜蜂" } }, "questID:3": 2108, diff --git a/config/betterquesting/DefaultQuests/Quests/5/736384140.json b/config/betterquesting/DefaultQuests/Quests/5/736384140.json new file mode 100644 index 00000000..f89935c7 --- /dev/null +++ b/config/betterquesting/DefaultQuests/Quests/5/736384140.json @@ -0,0 +1,315 @@ +{ + "preRequisites:11": [ + 1253, + 585706829 + ], + "properties:10": { + "betterquesting:10": { + "desc:8": "", + "icon:10": { + "Count:3": 1, + "id:8": "forestry:bee_queen_ge", + "tag:10": { + "Genome:10": { + "Chromosomes:9": { + "0:10": { + "Slot:1": 0, + "UID0:8": "gendustry.bee.Gallifreyan", + "UID1:8": "gendustry.bee.Gallifreyan" + }, + "1:10": { + "Slot:1": 1, + "UID0:8": "forestry.speedSlowest", + "UID1:8": "forestry.speedSlowest" + }, + "2:10": { + "Slot:1": 2, + "UID0:8": "forestry.lifespanShorter", + "UID1:8": "forestry.lifespanShorter" + }, + "3:10": { + "Slot:1": 3, + "UID0:8": "forestry.fertilityHigh", + "UID1:8": "forestry.fertilityHigh" + }, + "4:10": { + "Slot:1": 4, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "5:10": { + "Slot:1": 5, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "6:10": { + "Slot:1": 6, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "7:10": { + "Slot:1": 7, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "8:10": { + "Slot:1": 8, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "9:10": { + "Slot:1": 9, + "UID0:8": "forestry.flowersVanilla", + "UID1:8": "forestry.flowersVanilla" + }, + "10:10": { + "Slot:1": 10, + "UID0:8": "forestry.floweringSlower", + "UID1:8": "forestry.floweringSlower" + }, + "11:10": { + "Slot:1": 11, + "UID0:8": "forestry.territoryAverage", + "UID1:8": "forestry.territoryAverage" + }, + "12:10": { + "Slot:1": 12, + "UID0:8": "forestry.effectNone", + "UID1:8": "forestry.effectNone" + } + } + }, + "Health:3": 20, + "IsAnalyzed:1": 0, + "Mate:10": { + "Chromosomes:9": { + "0:10": { + "Slot:1": 0, + "UID0:8": "gendustry.bee.Gallifreyan", + "UID1:8": "gendustry.bee.Gallifreyan" + }, + "1:10": { + "Slot:1": 1, + "UID0:8": "forestry.speedSlowest", + "UID1:8": "forestry.speedSlowest" + }, + "2:10": { + "Slot:1": 2, + "UID0:8": "forestry.lifespanShorter", + "UID1:8": "forestry.lifespanShorter" + }, + "3:10": { + "Slot:1": 3, + "UID0:8": "forestry.fertilityHigh", + "UID1:8": "forestry.fertilityHigh" + }, + "4:10": { + "Slot:1": 4, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "5:10": { + "Slot:1": 5, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "6:10": { + "Slot:1": 6, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "7:10": { + "Slot:1": 7, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "8:10": { + "Slot:1": 8, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "9:10": { + "Slot:1": 9, + "UID0:8": "forestry.flowersVanilla", + "UID1:8": "forestry.flowersVanilla" + }, + "10:10": { + "Slot:1": 10, + "UID0:8": "forestry.floweringSlower", + "UID1:8": "forestry.floweringSlower" + }, + "11:10": { + "Slot:1": 11, + "UID0:8": "forestry.territoryAverage", + "UID1:8": "forestry.territoryAverage" + }, + "12:10": { + "Slot:1": 12, + "UID0:8": "forestry.effectNone", + "UID1:8": "forestry.effectNone" + } + } + }, + "MaxH:3": 20 + } + }, + "name:8": "伽里弗雷蜜蜂" + } + }, + "questID:3": 736384140, + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "forestry:bee_queen_ge", + "tag:10": { + "Genome:10": { + "Chromosomes:9": { + "0:10": { + "Slot:1": 0, + "UID0:8": "gendustry.bee.Gallifreyan", + "UID1:8": "gendustry.bee.Gallifreyan" + }, + "1:10": { + "Slot:1": 1, + "UID0:8": "forestry.speedSlowest", + "UID1:8": "forestry.speedSlowest" + }, + "2:10": { + "Slot:1": 2, + "UID0:8": "forestry.lifespanShorter", + "UID1:8": "forestry.lifespanShorter" + }, + "3:10": { + "Slot:1": 3, + "UID0:8": "forestry.fertilityHigh", + "UID1:8": "forestry.fertilityHigh" + }, + "4:10": { + "Slot:1": 4, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "5:10": { + "Slot:1": 5, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "6:10": { + "Slot:1": 6, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "7:10": { + "Slot:1": 7, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "8:10": { + "Slot:1": 8, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "9:10": { + "Slot:1": 9, + "UID0:8": "forestry.flowersVanilla", + "UID1:8": "forestry.flowersVanilla" + }, + "10:10": { + "Slot:1": 10, + "UID0:8": "forestry.floweringSlower", + "UID1:8": "forestry.floweringSlower" + }, + "11:10": { + "Slot:1": 11, + "UID0:8": "forestry.territoryAverage", + "UID1:8": "forestry.territoryAverage" + }, + "12:10": { + "Slot:1": 12, + "UID0:8": "forestry.effectNone", + "UID1:8": "forestry.effectNone" + } + } + }, + "Health:3": 20, + "IsAnalyzed:1": 0, + "Mate:10": { + "Chromosomes:9": { + "0:10": { + "Slot:1": 0, + "UID0:8": "gendustry.bee.Gallifreyan", + "UID1:8": "gendustry.bee.Gallifreyan" + }, + "1:10": { + "Slot:1": 1, + "UID0:8": "forestry.speedSlowest", + "UID1:8": "forestry.speedSlowest" + }, + "2:10": { + "Slot:1": 2, + "UID0:8": "forestry.lifespanShorter", + "UID1:8": "forestry.lifespanShorter" + }, + "3:10": { + "Slot:1": 3, + "UID0:8": "forestry.fertilityHigh", + "UID1:8": "forestry.fertilityHigh" + }, + "4:10": { + "Slot:1": 4, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "5:10": { + "Slot:1": 5, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "6:10": { + "Slot:1": 6, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "7:10": { + "Slot:1": 7, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "8:10": { + "Slot:1": 8, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "9:10": { + "Slot:1": 9, + "UID0:8": "forestry.flowersVanilla", + "UID1:8": "forestry.flowersVanilla" + }, + "10:10": { + "Slot:1": 10, + "UID0:8": "forestry.floweringSlower", + "UID1:8": "forestry.floweringSlower" + }, + "11:10": { + "Slot:1": 11, + "UID0:8": "forestry.territoryAverage", + "UID1:8": "forestry.territoryAverage" + }, + "12:10": { + "Slot:1": 12, + "UID0:8": "forestry.effectNone", + "UID1:8": "forestry.effectNone" + } + } + }, + "MaxH:3": 20 + } + } + }, + "taskID:8": "bq_standard:retrieval" + } + } +} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/5/949656804.json b/config/betterquesting/DefaultQuests/Quests/5/949656804.json new file mode 100644 index 00000000..96eed9d9 --- /dev/null +++ b/config/betterquesting/DefaultQuests/Quests/5/949656804.json @@ -0,0 +1,315 @@ +{ + "preRequisites:11": [ + 1253, + 585706829 + ], + "properties:10": { + "betterquesting:10": { + "desc:8": "", + "icon:10": { + "Count:3": 1, + "id:8": "forestry:bee_queen_ge", + "tag:10": { + "Genome:10": { + "Chromosomes:9": { + "0:10": { + "Slot:1": 0, + "UID0:8": "gendustry.bee.TreeOfLife", + "UID1:8": "gendustry.bee.TreeOfLife" + }, + "1:10": { + "Slot:1": 1, + "UID0:8": "forestry.speedSlowest", + "UID1:8": "forestry.speedSlowest" + }, + "2:10": { + "Slot:1": 2, + "UID0:8": "forestry.lifespanShorter", + "UID1:8": "forestry.lifespanShorter" + }, + "3:10": { + "Slot:1": 3, + "UID0:8": "forestry.fertilityHigh", + "UID1:8": "forestry.fertilityHigh" + }, + "4:10": { + "Slot:1": 4, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "5:10": { + "Slot:1": 5, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "6:10": { + "Slot:1": 6, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "7:10": { + "Slot:1": 7, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "8:10": { + "Slot:1": 8, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "9:10": { + "Slot:1": 9, + "UID0:8": "forestry.flowersVanilla", + "UID1:8": "forestry.flowersVanilla" + }, + "10:10": { + "Slot:1": 10, + "UID0:8": "forestry.floweringSlower", + "UID1:8": "forestry.floweringSlower" + }, + "11:10": { + "Slot:1": 11, + "UID0:8": "forestry.territoryAverage", + "UID1:8": "forestry.territoryAverage" + }, + "12:10": { + "Slot:1": 12, + "UID0:8": "forestry.effectNone", + "UID1:8": "forestry.effectNone" + } + } + }, + "Health:3": 20, + "IsAnalyzed:1": 0, + "Mate:10": { + "Chromosomes:9": { + "0:10": { + "Slot:1": 0, + "UID0:8": "gendustry.bee.TreeOfLife", + "UID1:8": "gendustry.bee.TreeOfLife" + }, + "1:10": { + "Slot:1": 1, + "UID0:8": "forestry.speedSlowest", + "UID1:8": "forestry.speedSlowest" + }, + "2:10": { + "Slot:1": 2, + "UID0:8": "forestry.lifespanShorter", + "UID1:8": "forestry.lifespanShorter" + }, + "3:10": { + "Slot:1": 3, + "UID0:8": "forestry.fertilityHigh", + "UID1:8": "forestry.fertilityHigh" + }, + "4:10": { + "Slot:1": 4, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "5:10": { + "Slot:1": 5, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "6:10": { + "Slot:1": 6, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "7:10": { + "Slot:1": 7, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "8:10": { + "Slot:1": 8, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "9:10": { + "Slot:1": 9, + "UID0:8": "forestry.flowersVanilla", + "UID1:8": "forestry.flowersVanilla" + }, + "10:10": { + "Slot:1": 10, + "UID0:8": "forestry.floweringSlower", + "UID1:8": "forestry.floweringSlower" + }, + "11:10": { + "Slot:1": 11, + "UID0:8": "forestry.territoryAverage", + "UID1:8": "forestry.territoryAverage" + }, + "12:10": { + "Slot:1": 12, + "UID0:8": "forestry.effectNone", + "UID1:8": "forestry.effectNone" + } + } + }, + "MaxH:3": 20 + } + }, + "name:8": "生命之树蜜蜂" + } + }, + "questID:3": 949656804, + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "forestry:bee_queen_ge", + "tag:10": { + "Genome:10": { + "Chromosomes:9": { + "0:10": { + "Slot:1": 0, + "UID0:8": "gendustry.bee.TreeOfLife", + "UID1:8": "gendustry.bee.TreeOfLife" + }, + "1:10": { + "Slot:1": 1, + "UID0:8": "forestry.speedSlowest", + "UID1:8": "forestry.speedSlowest" + }, + "2:10": { + "Slot:1": 2, + "UID0:8": "forestry.lifespanShorter", + "UID1:8": "forestry.lifespanShorter" + }, + "3:10": { + "Slot:1": 3, + "UID0:8": "forestry.fertilityHigh", + "UID1:8": "forestry.fertilityHigh" + }, + "4:10": { + "Slot:1": 4, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "5:10": { + "Slot:1": 5, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "6:10": { + "Slot:1": 6, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "7:10": { + "Slot:1": 7, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "8:10": { + "Slot:1": 8, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "9:10": { + "Slot:1": 9, + "UID0:8": "forestry.flowersVanilla", + "UID1:8": "forestry.flowersVanilla" + }, + "10:10": { + "Slot:1": 10, + "UID0:8": "forestry.floweringSlower", + "UID1:8": "forestry.floweringSlower" + }, + "11:10": { + "Slot:1": 11, + "UID0:8": "forestry.territoryAverage", + "UID1:8": "forestry.territoryAverage" + }, + "12:10": { + "Slot:1": 12, + "UID0:8": "forestry.effectNone", + "UID1:8": "forestry.effectNone" + } + } + }, + "Health:3": 20, + "IsAnalyzed:1": 0, + "Mate:10": { + "Chromosomes:9": { + "0:10": { + "Slot:1": 0, + "UID0:8": "gendustry.bee.TreeOfLife", + "UID1:8": "gendustry.bee.TreeOfLife" + }, + "1:10": { + "Slot:1": 1, + "UID0:8": "forestry.speedSlowest", + "UID1:8": "forestry.speedSlowest" + }, + "2:10": { + "Slot:1": 2, + "UID0:8": "forestry.lifespanShorter", + "UID1:8": "forestry.lifespanShorter" + }, + "3:10": { + "Slot:1": 3, + "UID0:8": "forestry.fertilityHigh", + "UID1:8": "forestry.fertilityHigh" + }, + "4:10": { + "Slot:1": 4, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "5:10": { + "Slot:1": 5, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "6:10": { + "Slot:1": 6, + "UID0:8": "forestry.toleranceNone", + "UID1:8": "forestry.toleranceNone" + }, + "7:10": { + "Slot:1": 7, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "8:10": { + "Slot:1": 8, + "UID0:8": "forestry.boolFalse", + "UID1:8": "forestry.boolFalse" + }, + "9:10": { + "Slot:1": 9, + "UID0:8": "forestry.flowersVanilla", + "UID1:8": "forestry.flowersVanilla" + }, + "10:10": { + "Slot:1": 10, + "UID0:8": "forestry.floweringSlower", + "UID1:8": "forestry.floweringSlower" + }, + "11:10": { + "Slot:1": 11, + "UID0:8": "forestry.territoryAverage", + "UID1:8": "forestry.territoryAverage" + }, + "12:10": { + "Slot:1": 12, + "UID0:8": "forestry.effectNone", + "UID1:8": "forestry.effectNone" + } + } + }, + "MaxH:3": 20 + } + } + }, + "taskID:8": "bq_standard:retrieval" + } + } +} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/7/2350.json b/config/betterquesting/DefaultQuests/Quests/7/2350.json index 4ef33a43..97395b89 100644 --- a/config/betterquesting/DefaultQuests/Quests/7/2350.json +++ b/config/betterquesting/DefaultQuests/Quests/7/2350.json @@ -9,7 +9,7 @@ "Count:3": 1, "id:8": "aoa3:sapphire" }, - "name:8": "[虚无]蓝宝石" + "name:8": "[飞升]蓝宝石" } }, "questID:3": 2350, diff --git a/config/betterquesting/DefaultQuests/Quests/7/70068.json b/config/betterquesting/DefaultQuests/Quests/7/70068.json index 67b92de6..584d4a23 100644 --- a/config/betterquesting/DefaultQuests/Quests/7/70068.json +++ b/config/betterquesting/DefaultQuests/Quests/7/70068.json @@ -9,7 +9,7 @@ "Count:3": 1, "id:8": "aoa3:jade" }, - "name:8": "[虚无]翡翠" + "name:8": "[飞升]翡翠" } }, "questID:3": 70068, diff --git a/config/betterquesting/DefaultQuests/Quests/7/70073.json b/config/betterquesting/DefaultQuests/Quests/7/70073.json index cd7d9dd5..d16a1f1d 100644 --- a/config/betterquesting/DefaultQuests/Quests/7/70073.json +++ b/config/betterquesting/DefaultQuests/Quests/7/70073.json @@ -9,7 +9,7 @@ "Count:3": 1, "id:8": "aoa3:amethyst" }, - "name:8": "[虚无]紫晶" + "name:8": "[飞升]紫晶" } }, "questID:3": 70073, diff --git a/config/betterquesting/resources/meatballcraft/textures/gui/default_title.png b/config/betterquesting/resources/meatballcraft/textures/gui/default_title.png new file mode 100644 index 00000000..8a024bd5 Binary files /dev/null and b/config/betterquesting/resources/meatballcraft/textures/gui/default_title.png differ diff --git a/config/bloodmagic/bloodmagic.cfg b/config/bloodmagic/bloodmagic.cfg index fbb20fd4..52bf89c2 100644 --- a/config/bloodmagic/bloodmagic.cfg +++ b/config/bloodmagic/bloodmagic.cfg @@ -307,6 +307,7 @@ values { ocelot;100 pig;100 rabbit;100 + testdummy:dummy;0 > # Will rewrite any default meteor types with new versions. @@ -317,4 +318,3 @@ values { B:wellOfSufferingDrops=true } - diff --git a/config/brokenwings.cfg b/config/brokenwings.cfg index f3356fd7..18233206 100644 --- a/config/brokenwings.cfg +++ b/config/brokenwings.cfg @@ -66,6 +66,28 @@ countermeasures { twilightforest:charm_of_life_2 dimension: 52 twilightforest:charm_of_life_1 dimension: 623 twilightforest:charm_of_life_2 dimension: 623 + twilightforest:charm_of_life_1 dimension: 800 + twilightforest:charm_of_life_2 dimension: 800 + twilightforest:charm_of_life_1 dimension: 802 + twilightforest:charm_of_life_2 dimension: 802 + twilightforest:charm_of_life_1 dimension: 420 + twilightforest:charm_of_life_2 dimension: 420 + twilightforest:charm_of_life_1 dimension: 421 + twilightforest:charm_of_life_2 dimension: 421 + twilightforest:charm_of_life_1 dimension: 422 + twilightforest:charm_of_life_2 dimension: 422 + twilightforest:charm_of_life_1 dimension: 423 + twilightforest:charm_of_life_2 dimension: 423 + ae2fc:wireless_fluid_pattern_terminal dimension: 427 + appliedenergistics2:wireless_terminal dimension: 427 + appliedenergistics2:wireless_crafting_terminal dimension: 427 + appliedenergistics2:wireless_pattern_terminal dimension: 427 + appliedenergistics2:wireless_fluid_terminal dimension: 427 + appliedenergistics2:wireless_interface_terminal dimension: 427 + ae2exttable:wireless_basic_crafting_terminal dimension: 427 + ae2exttable:wireless_advanced_crafting_terminal dimension: 427 + ae2exttable:wireless_elite_crafting_terminal dimension: 427 + ae2exttable:wireless_ultimate_crafting_terminal dimension: 427 > } @@ -114,6 +136,28 @@ countermeasures { twilightforest:charm_of_life_2 dimension: 52 twilightforest:charm_of_life_1 dimension: 623 twilightforest:charm_of_life_2 dimension: 623 + twilightforest:charm_of_life_1 dimension: 800 + twilightforest:charm_of_life_2 dimension: 800 + twilightforest:charm_of_life_1 dimension: 802 + twilightforest:charm_of_life_2 dimension: 802 + twilightforest:charm_of_life_1 dimension: 420 + twilightforest:charm_of_life_2 dimension: 420 + twilightforest:charm_of_life_1 dimension: 421 + twilightforest:charm_of_life_2 dimension: 421 + twilightforest:charm_of_life_1 dimension: 422 + twilightforest:charm_of_life_2 dimension: 422 + twilightforest:charm_of_life_1 dimension: 423 + twilightforest:charm_of_life_2 dimension: 423 + ae2fc:wireless_fluid_pattern_terminal dimension: 427 + appliedenergistics2:wireless_terminal dimension: 427 + appliedenergistics2:wireless_crafting_terminal dimension: 427 + appliedenergistics2:wireless_pattern_terminal dimension: 427 + appliedenergistics2:wireless_fluid_terminal dimension: 427 + appliedenergistics2:wireless_interface_terminal dimension: 427 + ae2exttable:wireless_basic_crafting_terminal dimension: 427 + ae2exttable:wireless_advanced_crafting_terminal dimension: 427 + ae2exttable:wireless_elite_crafting_terminal dimension: 427 + ae2exttable:wireless_ultimate_crafting_terminal dimension: 427 > } @@ -279,4 +323,3 @@ general { S:mode=DENY_LIST } - diff --git a/config/buildcraft/detailed.properties b/config/buildcraft/detailed.properties index 0fbf07d5..0f1a8f65 100644 --- a/config/buildcraft/detailed.properties +++ b/config/buildcraft/detailed.properties @@ -1,5 +1,5 @@ # The buildcraft detailed configuration file. This contains a lot of miscellaneous options that have no affect on gameplay. # You should refer to the BC source code for a detailed description of what these do. (https://github.com/BuildCraft/BuildCraft) # This file will be overwritten every time that buildcraft starts, so don't change anything other than the values. -#Sat Apr 26 10:16:24 PDT 2025 -render.pipe.misc.inside.shade=0.725 +#Thu May 08 18:24:08 PDT 2025 +render.pipe.misc.inside.shade=0.725 \ No newline at end of file diff --git a/config/compactmachines3/recipes/advancedr-spacelaser.json b/config/compactmachines3/recipes/advancedr-spacelaser.json deleted file mode 100644 index 08087197..00000000 --- a/config/compactmachines3/recipes/advancedr-spacelaser.json +++ /dev/null @@ -1,413 +0,0 @@ -{ - "name": "cm3ar:spacelaser", - - "disabled": false, - - "target-item": "advancedrocketry:spacelaser", - "target-count": 1, - - "duration": 200, - "symmetrical": true, - - "catalyst": "contenttweaker:multiblock_preview", - "catalyst-meta": 0, - - - "input-types": { - "a": { - "id": "libvulpesdvstructuremachine", - "meta": 0 - }, - "b": { - "id": "advancedrocketry:vacuumlaser", - "meta": 1, - "item": { - "id": "advancedrocketry:vacuumlaser", - "count": 48 - } - }, - "c": { - "id": "advancedrocketry:blocklens", - "meta": 0 - }, - "d": { - "id": "libvulpes:forgepowerinput", - "meta": 0 - }, - "e": { - "id": "libvulpes:hatch", - "meta": 1 - }, - "f": { - "id": "advancedrocketry:spacelaser", - "meta": 0, - "item": { - "id": "advancedrocketry:spacelaser", - "count": 1 - } - }, - "g": { - "id": "libvulpes:structuremachine", - "meta": 0 - } - }, - "shape": [ - [ - [ - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_" - ], - [ - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_" - ], - [ - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_" - ], - [ - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "a", - "_" - ], - [ - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "a", - "a", - "a" - ], - [ - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "a", - "_" - ], - [ - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_" - ], - [ - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_" - ], - [ - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_", - "_" - ] - ], - [ - [ - "_", - "b", - "b", - "b", - "a", - "_", - "_", - "_", - "_", - "_", - "_" - ], - [ - "d", - "b", - "b", - "b", - "c", - "c", - "a", - "_", - "_", - "_", - "_" - ], - [ - "d", - "b", - "b", - "b", - "a", - "a", - "a", - "_", - "_", - "_", - "_" - ], - [ - "_", - "b", - "b", - "b", - "a", - "_", - "c", - "_", - "g", - "a", - "g" - ], - [ - "_", - "_", - "_", - "_", - "_", - "_", - "a", - "c", - "a", - "a", - "a" - ], - [ - "_", - "b", - "b", - "b", - "a", - "_", - "c", - "_", - "g", - "a", - "g" - ], - [ - "d", - "b", - "b", - "b", - "a", - "a", - "a", - "_", - "_", - "_", - "_" - ], - [ - "d", - "b", - "b", - "b", - "c", - "c", - "a", - "_", - "_", - "_", - "_" - ], - [ - "_", - "b", - "b", - "b", - "a", - "_", - "_", - "_", - "_", - "_", - "_" - ] - ], - [ - [ - "_", - "b", - "b", - "b", - "a", - "_", - "_", - "_", - "_", - "_", - "_" - ], - [ - "d", - "b", - "b", - "b", - "c", - "c", - "a", - "_", - "_", - "_", - "_" - ], - [ - "d", - "b", - "b", - "b", - "a", - "a", - "a", - "_", - "e", - "f", - "e" - ], - [ - "_", - "b", - "b", - "b", - "a", - "_", - "c", - "_", - "g", - "g", - "g" - ], - [ - "_", - "_", - "_", - "_", - "_", - "_", - "a", - "c", - "g", - "g", - "g" - ], - [ - "_", - "b", - "b", - "b", - "a", - "_", - "c", - "_", - "g", - "g", - "g" - ], - [ - "d", - "b", - "b", - "b", - "a", - "a", - "a", - "_", - "_", - "_", - "_" - ], - [ - "d", - "b", - "b", - "b", - "c", - "c", - "a", - "_", - "_", - "_", - "_" - ], - [ - "_", - "b", - "b", - "b", - "a", - "_", - "_", - "_", - "_", - "_", - "_" - ] - ] - ] -} \ No newline at end of file diff --git a/config/compactmachines3/recipes/dyson_abater_helper.json b/config/compactmachines3/recipes/dyson_abater_helper.json index 11efb628..057ae2d7 100644 --- a/config/compactmachines3/recipes/dyson_abater_helper.json +++ b/config/compactmachines3/recipes/dyson_abater_helper.json @@ -27,11 +27,10 @@ "d": { "id": "minecraft:wool", "meta": 0 - } - }, - "input-nbt": { - "a:A": { - "nbt": "{rotation:0b,owner:\"8c381e15-592d-4003-ae11-6367e203127b\",ForgeCaps:{\"abyssalcraft:itemtransfer\":{configurations:[],isRunning:0b},\"nuclearcraft:capability_default_radiation_resistance\":{radiationResistance:0.0d}},casingColor:16730368,id:\"minecraft:tilemachinecontroller\",items:{inSlots:[I;],outSlots:[I;],miscSlots:[I;0],inventoryArray:[{holderId:0,holderEmpty:1b}],sides:[I;0,1,2,3,4,5]},parentMachine:\"modularmachinery:dyson_revolver\",statusTag:{type:0b,message:\"\"}}" + }, + "e": { + "id": "modularmachinery:dyson_abater_controller", + "meta": 0 } }, "shape": [ @@ -63,7 +62,7 @@ ], [ [ - "a:A" + "a" ], [ "d" @@ -84,7 +83,7 @@ "b" ], [ - "a:A" + "e" ] ], [ diff --git a/config/compactmachines3/recipes/dyson_irradiator_helper0.json b/config/compactmachines3/recipes/dyson_irradiator_helper0.json index 951a7c6c..78f1141c 100644 --- a/config/compactmachines3/recipes/dyson_irradiator_helper0.json +++ b/config/compactmachines3/recipes/dyson_irradiator_helper0.json @@ -34,17 +34,6 @@ "meta": 2 } }, - "input-nbt": { - "a:A": { - "nbt": "{rotation:2b,owner:\"8c381e15-592d-4003-ae11-6367e203127b\",ForgeCaps:{\"abyssalcraft:itemtransfer\":{configurations:[],isRunning:0b},\"nuclearcraft:capability_default_radiation_resistance\":{radiationResistance:0.0d}},casingColor:16730368,id:\"minecraft:tilemachinecontroller\",items:{inSlots:[I;],outSlots:[I;],miscSlots:[I;0],inventoryArray:[{holderId:0,holderEmpty:1b}],sides:[I;0,1,2,3,4,5]},parentMachine:\"modularmachinery:dyson_irradiator_top\",statusTag:{type:0b,message:\"\"}}" - }, - "d:A": { - "nbt": "{rotation:2b,owner:\"8c381e15-592d-4003-ae11-6367e203127b\",ForgeCaps:{\"abyssalcraft:itemtransfer\":{configurations:[],isRunning:0b},\"nuclearcraft:capability_default_radiation_resistance\":{radiationResistance:0.0d}},casingColor:16730368,id:\"minecraft:tilemachinecontroller\",items:{inSlots:[I;],outSlots:[I;],miscSlots:[I;0],inventoryArray:[{holderId:0,holderEmpty:1b}],sides:[I;0,1,2,3,4,5]},parentMachine:\"modularmachinery:dyson_irradiator_bottom\",statusTag:{type:0b,message:\"\"}}" - }, - "e:A": { - "nbt": "{rotation:2b,owner:\"8c381e15-592d-4003-ae11-6367e203127b\",ForgeCaps:{\"abyssalcraft:itemtransfer\":{configurations:[],isRunning:0b},\"nuclearcraft:capability_default_radiation_resistance\":{radiationResistance:0.0d}},casingColor:16730368,id:\"minecraft:tilemachinecontroller\",items:{inSlots:[I;],outSlots:[I;],miscSlots:[I;0],inventoryArray:[{holderId:0,holderEmpty:1b}],sides:[I;0,1,2,3,4,5]},parentMachine:\"modularmachinery:dyson_irradiator\",statusTag:{type:0b,message:\"\"}}" - } - }, "shape": [ [ [ @@ -54,7 +43,7 @@ "_" ], [ - "a:A" + "a" ] ], [ @@ -114,7 +103,7 @@ ], [ [ - "e:A" + "e" ], [ "b" @@ -186,7 +175,7 @@ "_" ], [ - "d:A" + "d" ] ] ] diff --git a/config/compactmachines3/recipes/dyson_irradiator_helper1.json b/config/compactmachines3/recipes/dyson_irradiator_helper1.json index 399f554e..06ab7488 100644 --- a/config/compactmachines3/recipes/dyson_irradiator_helper1.json +++ b/config/compactmachines3/recipes/dyson_irradiator_helper1.json @@ -34,17 +34,6 @@ "meta": 2 } }, - "input-nbt": { - "a:A": { - "nbt": "{rotation:2b,owner:\"8c381e15-592d-4003-ae11-6367e203127b\",ForgeCaps:{\"abyssalcraft:itemtransfer\":{configurations:[],isRunning:0b},\"nuclearcraft:capability_default_radiation_resistance\":{radiationResistance:0.0d}},casingColor:16730368,id:\"minecraft:tilemachinecontroller\",items:{inSlots:[I;],outSlots:[I;],miscSlots:[I;0],inventoryArray:[{holderId:0,holderEmpty:1b}],sides:[I;0,1,2,3,4,5]},parentMachine:\"modularmachinery:dyson_irradiator_top\",statusTag:{type:0b,message:\"\"}}" - }, - "d:A": { - "nbt": "{rotation:2b,owner:\"8c381e15-592d-4003-ae11-6367e203127b\",ForgeCaps:{\"abyssalcraft:itemtransfer\":{configurations:[],isRunning:0b},\"nuclearcraft:capability_default_radiation_resistance\":{radiationResistance:0.0d}},casingColor:16730368,id:\"minecraft:tilemachinecontroller\",items:{inSlots:[I;],outSlots:[I;],miscSlots:[I;0],inventoryArray:[{holderId:0,holderEmpty:1b}],sides:[I;0,1,2,3,4,5]},parentMachine:\"modularmachinery:dyson_irradiator_bottom\",statusTag:{type:0b,message:\"\"}}" - }, - "e:A": { - "nbt": "{rotation:2b,owner:\"8c381e15-592d-4003-ae11-6367e203127b\",ForgeCaps:{\"abyssalcraft:itemtransfer\":{configurations:[],isRunning:0b},\"nuclearcraft:capability_default_radiation_resistance\":{radiationResistance:0.0d}},casingColor:16730368,id:\"minecraft:tilemachinecontroller\",items:{inSlots:[I;],outSlots:[I;],miscSlots:[I;0],inventoryArray:[{holderId:0,holderEmpty:1b}],sides:[I;0,1,2,3,4,5]},parentMachine:\"modularmachinery:dyson_irradiator\",statusTag:{type:0b,message:\"\"}}" - } - }, "shape": [ [ [ @@ -54,7 +43,7 @@ "_" ], [ - "a:A" + "a" ] ], [ @@ -114,7 +103,7 @@ ], [ [ - "e:A" + "e" ], [ "b" @@ -186,7 +175,7 @@ "_" ], [ - "d:A" + "d" ] ] ] diff --git a/config/compactmachines3/recipes/dyson_irradiator_helper2.json b/config/compactmachines3/recipes/dyson_irradiator_helper2.json index c041f31c..c68f2af3 100644 --- a/config/compactmachines3/recipes/dyson_irradiator_helper2.json +++ b/config/compactmachines3/recipes/dyson_irradiator_helper2.json @@ -11,7 +11,6 @@ - "input-types": { "a": { "id": "modularmachinery:dyson_irradiator_top_controller", @@ -34,17 +33,6 @@ "meta": 2 } }, - "input-nbt": { - "a:A": { - "nbt": "{rotation:2b,owner:\"8c381e15-592d-4003-ae11-6367e203127b\",ForgeCaps:{\"abyssalcraft:itemtransfer\":{configurations:[],isRunning:0b},\"nuclearcraft:capability_default_radiation_resistance\":{radiationResistance:0.0d}},casingColor:16730368,id:\"minecraft:tilemachinecontroller\",items:{inSlots:[I;],outSlots:[I;],miscSlots:[I;0],inventoryArray:[{holderId:0,holderEmpty:1b}],sides:[I;0,1,2,3,4,5]},parentMachine:\"modularmachinery:dyson_irradiator_top\",statusTag:{type:0b,message:\"\"}}" - }, - "d:A": { - "nbt": "{rotation:2b,owner:\"8c381e15-592d-4003-ae11-6367e203127b\",ForgeCaps:{\"abyssalcraft:itemtransfer\":{configurations:[],isRunning:0b},\"nuclearcraft:capability_default_radiation_resistance\":{radiationResistance:0.0d}},casingColor:16730368,id:\"minecraft:tilemachinecontroller\",items:{inSlots:[I;],outSlots:[I;],miscSlots:[I;0],inventoryArray:[{holderId:0,holderEmpty:1b}],sides:[I;0,1,2,3,4,5]},parentMachine:\"modularmachinery:dyson_irradiator_bottom\",statusTag:{type:0b,message:\"\"}}" - }, - "e:A": { - "nbt": "{rotation:2b,owner:\"8c381e15-592d-4003-ae11-6367e203127b\",ForgeCaps:{\"abyssalcraft:itemtransfer\":{configurations:[],isRunning:0b},\"nuclearcraft:capability_default_radiation_resistance\":{radiationResistance:0.0d}},casingColor:16730368,id:\"minecraft:tilemachinecontroller\",items:{inSlots:[I;],outSlots:[I;],miscSlots:[I;0],inventoryArray:[{holderId:0,holderEmpty:1b}],sides:[I;0,1,2,3,4,5]},parentMachine:\"modularmachinery:dyson_irradiator\",statusTag:{type:0b,message:\"\"}}" - } - }, "shape": [ [ [ @@ -54,7 +42,7 @@ "_" ], [ - "a:A" + "a" ] ], [ @@ -114,7 +102,7 @@ ], [ [ - "e:A" + "e" ], [ "b" @@ -186,7 +174,7 @@ "_" ], [ - "d:A" + "d" ] ] ] diff --git a/config/compactmachines3/recipes/dyson_revolver_helper.json b/config/compactmachines3/recipes/dyson_revolver_helper.json index 545a9f76..51146cf5 100644 --- a/config/compactmachines3/recipes/dyson_revolver_helper.json +++ b/config/compactmachines3/recipes/dyson_revolver_helper.json @@ -23,18 +23,10 @@ "meta": 0 } }, - "input-nbt": { - "a:A": { - "nbt": "{rotation:0b,owner:\"8c381e15-592d-4003-ae11-6367e203127b\",ForgeCaps:{\"abyssalcraft:itemtransfer\":{configurations:[],isRunning:0b},\"nuclearcraft:capability_default_radiation_resistance\":{radiationResistance:0.0d}},casingColor:16730368,id:\"minecraft:tilemachinecontroller\",items:{inSlots:[I;],outSlots:[I;],miscSlots:[I;0],inventoryArray:[{holderId:0,holderEmpty:1b}],sides:[I;0,1,2,3,4,5]},parentMachine:\"modularmachinery:dyson_scatterer\",statusTag:{type:0b,message:\"\"}}" - }, - "c:A": { - "nbt": "{rotation:0b,owner:\"8c381e15-592d-4003-ae11-6367e203127b\",ForgeCaps:{\"abyssalcraft:itemtransfer\":{configurations:[],isRunning:0b},\"nuclearcraft:capability_default_radiation_resistance\":{radiationResistance:0.0d}},casingColor:16730368,id:\"minecraft:tilemachinecontroller\",items:{inSlots:[I;],outSlots:[I;],miscSlots:[I;0],inventoryArray:[{holderId:0,holderEmpty:1b}],sides:[I;0,1,2,3,4,5]},parentMachine:\"modularmachinery:dyson_revolver\",statusTag:{type:0b,message:\"\"}}" - } - }, "shape": [ [ [ - "a:A" + "a" ], [ "_" @@ -63,7 +55,7 @@ "b" ], [ - "c:A" + "c" ] ] ] diff --git a/config/compactmachines3/recipes/dyson_scatterer_helper.json b/config/compactmachines3/recipes/dyson_scatterer_helper.json index c914a79e..8364ba3f 100644 --- a/config/compactmachines3/recipes/dyson_scatterer_helper.json +++ b/config/compactmachines3/recipes/dyson_scatterer_helper.json @@ -47,14 +47,6 @@ "meta": 0 } }, - "input-nbt": { - "a:A": { - "nbt": "{rotation:0b,owner:\"8c381e15-592d-4003-ae11-6367e203127b\",ForgeCaps:{\"abyssalcraft:itemtransfer\":{configurations:[],isRunning:0b},\"nuclearcraft:capability_default_radiation_resistance\":{radiationResistance:0.0d}},casingColor:16730368,id:\"minecraft:tilemachinecontroller\",items:{inSlots:[I;],outSlots:[I;],miscSlots:[I;0],inventoryArray:[{holderId:0,holderEmpty:1b}],sides:[I;0,1,2,3,4,5]},parentMachine:\"modularmachinery:dyson_dynamizer\",statusTag:{type:0b,message:\"\"}}" - }, - "h:A": { - "nbt": "{rotation:0b,owner:\"8c381e15-592d-4003-ae11-6367e203127b\",ForgeCaps:{\"abyssalcraft:itemtransfer\":{configurations:[],isRunning:0b},\"nuclearcraft:capability_default_radiation_resistance\":{radiationResistance:0.0d}},casingColor:16730368,id:\"minecraft:tilemachinecontroller\",items:{inSlots:[I;],outSlots:[I;],miscSlots:[I;0],inventoryArray:[{holderId:0,holderEmpty:1b}],sides:[I;0,1,2,3,4,5]},parentMachine:\"modularmachinery:dyson_scatterer\",statusTag:{type:0b,message:\"\"}}" - } - }, "shape": [ [ [ @@ -85,12 +77,12 @@ "_" ], [ - "h:A" + "h" ] ], [ [ - "a:A" + "a" ], [ "c" diff --git a/config/compactmachines3/recipes/flint_furnace_structure.json b/config/compactmachines3/recipes/flint_furnace_structure.json new file mode 100644 index 00000000..135e0ffa --- /dev/null +++ b/config/compactmachines3/recipes/flint_furnace_structure.json @@ -0,0 +1,322 @@ +{ + "name": "compactmachines3:flint_furnace_structure", + "target-item": "contenttweaker:flint_and_furnace", + "target-meta": 0, + "target-count": 1, + + "duration": 200, + + "catalyst": "contenttweaker:multiblock_preview", + + + + + + "input-types": { + "a": { + "id": "extrautils2:compressedcobblestone", + "meta": 2 + }, + "c": { + "id": "minecraft:coal_block", + "meta": 0 + }, + "d": { + "id": "extrautils2:compressedcobblestone", + "meta": 3 + } + }, + "shape": [ + [ + [ + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "_", + "d", + "_", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "d", + "_", + "_", + "_", + "d", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "_", + "d", + "_", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_", + "_" + ] + ], + [ + [ + "_", + "_", + "_", + "_", + "_", + "a", + "_", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "_", + "a", + "_", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "a", + "a", + "a", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "a", + "a", + "a", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "a", + "a", + "a", + "c", + "a", + "a", + "a", + "_", + "_" + ], + [ + "a", + "a", + "a", + "a", + "c", + "c", + "c", + "a", + "a", + "a", + "a" + ], + [ + "_", + "_", + "a", + "a", + "a", + "c", + "a", + "a", + "a", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "a", + "a", + "a", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "a", + "a", + "a", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "_", + "a", + "_", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "_", + "a", + "_", + "_", + "_", + "_", + "_" + ] + ] + ] + +} \ No newline at end of file diff --git a/config/compactmachines3/recipes/vibe_warper_structure.json b/config/compactmachines3/recipes/vibe_warper_structure.json new file mode 100644 index 00000000..c6cdecd9 --- /dev/null +++ b/config/compactmachines3/recipes/vibe_warper_structure.json @@ -0,0 +1,226 @@ +{ + "name": "compactmachines3:vibe_warper_structure", + "target-item": "contenttweaker:vibe_warper", + "target-meta": 0, + "target-count": 1, + + "duration": 200, + + "catalyst": "contenttweaker:multiblock_preview", + + + + + "input-types": { + "a": { + "id": "thaumcraft:metal_alchemical_advanced", + "meta": 0 + }, + "b": { + "id": "thaumcraft:stone_arcane_brick", + "meta": 0 + }, + "c": { + "id": "aoa3:ancient_rock", + "meta": 0 + } + }, + "shape": [ + [ + [ + "_", + "_", + "a", + "_", + "a", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "_", + "_", + "_" + ], + [ + "a", + "_", + "_", + "_", + "_", + "_", + "a" + ], + [ + "_", + "_", + "_", + "_", + "_", + "_", + "_" + ], + [ + "a", + "_", + "_", + "_", + "_", + "_", + "a" + ], + [ + "_", + "_", + "_", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "a", + "_", + "a", + "_", + "_" + ] + ], + [ + [ + "_", + "_", + "b", + "_", + "b", + "_", + "_" + ], + [ + "_", + "_", + "_", + "_", + "_", + "_", + "_" + ], + [ + "b", + "_", + "_", + "_", + "_", + "_", + "b" + ], + [ + "_", + "_", + "_", + "_", + "_", + "_", + "_" + ], + [ + "b", + "_", + "_", + "_", + "_", + "_", + "b" + ], + [ + "_", + "_", + "_", + "_", + "_", + "_", + "_" + ], + [ + "_", + "_", + "b", + "_", + "b", + "_", + "_" + ] + ], + [ + [ + "_", + "_", + "b", + "b", + "b", + "_", + "_" + ], + [ + "_", + "_", + "b", + "c", + "b", + "_", + "_" + ], + [ + "b", + "b", + "b", + "c", + "b", + "b", + "b" + ], + [ + "b", + "c", + "c", + "c", + "c", + "c", + "b" + ], + [ + "b", + "b", + "b", + "c", + "b", + "b", + "b" + ], + [ + "_", + "_", + "b", + "c", + "b", + "_", + "_" + ], + [ + "_", + "_", + "b", + "b", + "b", + "_", + "_" + ] + ] + ] + +} \ No newline at end of file diff --git a/config/cyclicmagic.cfg b/config/cyclicmagic.cfg index 4022808b..041b2536 100644 --- a/config/cyclicmagic.cfg +++ b/config/cyclicmagic.cfg @@ -1401,6 +1401,8 @@ modpacks { rftoolsdim_terrain_absorber rftoolsdim:feature_absorber rftoolsdim:time_absorber + xnet:controller + packagedexcrafting:marked_pedestal > # Crops & leaves that are blocked from harvesting (Brush Scythe and Tree Scythe). A star is for a wildcard [default: [terraqueous:pergola], [harvestcraft:*_sapling]] @@ -1739,4 +1741,3 @@ modpacks { } - diff --git a/config/defaultoptions/keybindings.txt b/config/defaultoptions/keybindings.txt index d01515be..08972a73 100644 --- a/config/defaultoptions/keybindings.txt +++ b/config/defaultoptions/keybindings.txt @@ -75,6 +75,7 @@ key_key.erebus.glide:0:NONE key_key.erebus.poweredglide:0:NONE key_key.erebus.beetleram:0:NONE key_key.erebus.beetlemine:56:NONE +key_Open sound muffler screen:0:NONE key_keybind.hammercorerenderstack:77:NONE key_key.xu2.searchforitems:31:SHIFT key_key.findme.search:23:SHIFT @@ -127,6 +128,11 @@ key_key.open_wireless_terminal.desc:20:CONTROL key_key.open_wireless_crafting_terminal.desc:18:CONTROL key_key.open_wireless_pattern_terminal.desc:19:CONTROL key_key.open_wireless_fluid_terminal.desc:33:CONTROL +key_key.open_wireless_interface_terminal.desc:23:SHIFT +key_key.open_basic_extended_wireless_crafting_terminal:0:NONE +key_key.open_advanced_extended_wireless_crafting_terminal:0:NONE +key_key.open_elite_extended_wireless_crafting_terminal:0:NONE +key_key.open_ultimate_extended_wireless_crafting_terminal:0:NONE key_key.aether.accessory_menu:0:NONE key_key.keyExtraInvo:0:NONE key_key.keyWheel:0:NONE @@ -175,7 +181,7 @@ key_key.porterNextDestination:27:NONE key_key.porterPrevDestination:26:NONE key_key.debugDumpNBTItem:0:NONE key_key.debugDumpNBTBlock:0:NONE -key_invtweaks.key.sort:19:SHIFT +key_invtweaks.key.sort:0:NONE key_key.jeiutilities.displayRecipe:29:NONE key_key.jeiutilities.pickBookmark:-98:NONE key_key.jeiutilities.transferRecipe:17:CONTROL @@ -254,4 +260,4 @@ key_enderio.keybind.fovrecall:0:NONE key_enderio.keybind.fovplus:0:NONE key_enderio.keybind.fovminus:0:NONE key_enderio.keybind.fovplusfast:0:NONE -key_enderio.keybind.fovminusfast:0:NONE +key_enderio.keybind.fovminusfast:0:NONE \ No newline at end of file diff --git a/config/extremesoundmuffler.cfg b/config/extremesoundmuffler.cfg new file mode 100644 index 00000000..4baf5e30 --- /dev/null +++ b/config/extremesoundmuffler.cfg @@ -0,0 +1,56 @@ +# Configuration file + +anchors { + # Disable the Anchors? + B:disableAnchors=false +} + + +general { + # Volume set when pressed the mute button by default + # Min: 0.0 + # Max: 0.99 + D:defaultMuteVolume=0.0 + + # Blacklisted Sounds - add the name of the sounds to blacklist, separated with comma + S:forbiddenSounds < + ui. + music. + ambient. + > + + # Hide non-recent muffled sounds from the recent sounds list + B:hideMuffledFromRecent=true + + # Allow the "ALL" sounds list to include the blacklisted sounds? + B:lawfulAllList=false + + # Move the muffle and play buttons to the left side of the GUI + B:leftButtons=false + + # Show tips in the Muffler screen? + B:showTip=true + + # Whether or not use the dark theme + B:useDarkTheme=false +} + + +########################################################################################################## +# inventory_button +#--------------------------------------------------------------------------------------------------------# +# Buttons can be moved by holding CTRL and LMB over the button and dragging it around +########################################################################################################## + +inventory_button { + # Disable the Muffle button in the player inventory? + B:disableInventoryButton=false + + # X coordinate of the Muffler button in the player inventory. + I:invButtonX=75 + + # Y coordinate of the Muffler button in the player inventory. + I:invButtonY=7 +} + + diff --git a/config/gendustry/meatball_bees.cfg b/config/gendustry/meatball_bees.cfg index 8ab96cb8..e3c26b6f 100644 --- a/config/gendustry/meatball_bees.cfg +++ b/config/gendustry/meatball_bees.cfg @@ -2805,7 +2805,6 @@ if HaveForestryModule Bees << mutation: 55% "gendustry.bee.Radiant" + "magicbees.speciesArcane" => "gendustry.bee.Serenading" Req Temperature Normal mutation: 55% "gendustry.bee.Bomber" + "careerbees.phd" => "gendustry.bee.Nucleartechnician" Req Temperature Normal mutation: 55% "magicbees.speciesTEPyro" + "careerbees.phd" => "gendustry.bee.Thermallyexpanded" Req Temperature Normal - mutation: 55% "magicbees.speciesTEPyro" + "careerbees.phd" => "gendustry.bee.Thermallyexpanded" Req Temperature Normal mutation: 36% "gendustry.bee.Oxygen" + "gendustry.bee.Deeplearner" => "gendustry.bee.Helium" Req Temperature Normal mutation: 36% "gendustry.bee.Oxygen" + "gendustry.bee.Helium" => "gendustry.bee.Fluorine" Req Temperature Normal mutation: 42% "forestry.speciesPhantasmal" + "magicbees.speciesEmerald" => "gendustry.bee.NerdySpider" Req Temperature Normal @@ -2816,8 +2815,7 @@ if HaveForestryModule Bees << mutation: 60% "magicbees.speciesSorcerous" + "careerbees.acceleration" => "gendustry.bee.LordRaine" Req Temperature Normal mutation: 20% "extrabees.species.bone" + "magicbees.speciesScholarly" => "gendustry.bee.Aedial" Req Temperature Normal mutation: 22% "gendustry.bee.Ringbearer" + "extrabees.species.granite" => "gendustry.bee.Mathias" Req Temperature Normal - mutation: 99% "extrabees.species.energetic" + "magicbees.speciesSavants" => "gendustry.bee.ChaosStrikez" Req Temperature Normal - mutation: 99% "careerbees.energy" + "gendustry.bee.Balanced" => "gendustry.bee.TreeOfLife" Req Temperature Normal + mutation: 99% "extrabees.species.energetic" + "magicbees.speciesSavant" => "gendustry.bee.ChaosStrikez" Req Temperature Normal } diff --git a/config/gendustry/meatball_bees.en_US.lang b/config/gendustry/meatball_bees.en_US.lang index 3d90f489..922f7f13 100644 --- a/config/gendustry/meatball_bees.en_US.lang +++ b/config/gendustry/meatball_bees.en_US.lang @@ -107,3 +107,15 @@ gendustry.honeycomb.fluorine.name=Fluorine Comb gendustry.honeycomb.helium.name=Helium Comb gendustry.allele.flowers.woodLog=Wood Logs gendustry.allele.flowers.sideralSteel=Steel +gendustry.bees.species.Connor=Connor +gendustry.bees.species.Kurrycat=KurryCat +gendustry.bees.species.Gallifreyan=Gallifreyan +gendustry.bees.species.Aedial=Aedial +gendustry.bees.species.NerdySpider=NerdySpider +gendustry.bees.species.ChaosStrikez=ChaosStrikez +gendustry.bees.species.UniversalConstellation=Universal Constellation +gendustry.bees.species.TreeOfLife=Tree of Life +gendustry.bees.species.Mathias=Mathias +gendustry.bees.species.SpoonyPanda=SpoonyPanda +gendustry.bees.species.LordRaine=LordRaine +gendustry.bees.species.Freeky=Freeky diff --git a/config/gendustry/meatball_bees.zh_cn.lang b/config/gendustry/meatball_bees.zh_cn.lang index b5c653af..4eb4ba6c 100644 --- a/config/gendustry/meatball_bees.zh_cn.lang +++ b/config/gendustry/meatball_bees.zh_cn.lang @@ -76,8 +76,8 @@ gendustry.bees.species.Deeplearner=深度学习 gendustry.bees.species.Salty=咸盐 gendustry.bees.species.Stormborn=飓风之子 gendustry.bees.species.Pyromaniacal=Pyromaniacal -gendustry.bees.species.Apothecary=药剂师 -gendustry.honeycomb.apothecary.name=药剂师蜂窝 +gendustry.bees.species.Apothecary=药师 +gendustry.honeycomb.apothecary.name=药师蜂窝 gendustry.honeycomb.isekai.name=异世界蜂窝 gendustry.honeycomb.twilightnether.name=深层暮光蜂窝 gendustry.honeycomb.soulsucking.name=吸魂蜂窝 @@ -107,3 +107,15 @@ gendustry.honeycomb.fluorine.name=氟蜂窝 gendustry.honeycomb.helium.name=氦蜂窝 gendustry.allele.flowers.woodLog=原木 gendustry.allele.flowers.sideralSteel=钢 +gendustry.bees.species.Connor=Connor +gendustry.bees.species.Kurrycat=KurryCat +gendustry.bees.species.Gallifreyan=伽里弗雷 +gendustry.bees.species.Aedial=Aedial +gendustry.bees.species.NerdySpider=NerdySpider +gendustry.bees.species.ChaosStrikez=ChaosStrikez +gendustry.bees.species.UniversalConstellation=宇宙星座 +gendustry.bees.species.TreeOfLife=生命之树 +gendustry.bees.species.Mathias=Mathias +gendustry.bees.species.SpoonyPanda=SpoonyPanda +gendustry.bees.species.LordRaine=LordRaine +gendustry.bees.species.Freeky=Freeky diff --git a/config/ichunutil.cfg b/config/ichunutil.cfg index d615572c..dc5d4a45 100644 --- a/config/ichunutil.cfg +++ b/config/ichunutil.cfg @@ -70,7 +70,7 @@ module { I:versionNotificationTypes=0 # Don't change this. - I:versionSave=26 + I:versionSave=8 } } @@ -88,4 +88,3 @@ module { } - diff --git a/config/jei/itemBlacklist.cfg b/config/jei/itemBlacklist.cfg index c54ac709..15cad333 100644 --- a/config/jei/itemBlacklist.cfg +++ b/config/jei/itemBlacklist.cfg @@ -301,6 +301,7 @@ advanced { tconstruct:shovel:0:alumite,alumite,alumite openblocks:tank:hassium; enderio:item_broken_spawner:Primordial Wizard + enderio:item_broken_spawner:Spectral Golem enderio:item_broken_spawner:Creep openblocks:tank:universal_matter; openblocks:tank:binnie.whiskey.wheat; @@ -349,6 +350,7 @@ advanced { tconstruct:lumberaxe:0:elementium,elementium,elementium,elementium enderio:item_soul_vial:Carrotop extracells:pattern.fluid:refined_biofuel;m=0 + enderio:item_broken_spawner:Invasion Cyberman tconstruct:shortbow:0:stone,stone,string tconstruct:hatchet:0:amethyst,amethyst,amethyst extracells:pattern.fluid:oganesson;m=0 @@ -846,6 +848,7 @@ advanced { openblocks:tank:oganesson; openblocks:tank:abyssite; enderio:item_broken_spawner:Lesser Shoggoth + enderio:item_broken_spawner:Lightning Dragon tconstruct:cleaver:0:ma.intermedium,ma.intermedium,ma.intermedium,ma.intermedium enderio:item_soul_vial:Mystic Lottoman tconstruct:hammer:0:terrasteel,terrasteel,terrasteel,terrasteel @@ -1157,6 +1160,7 @@ advanced { enderio:item_broken_spawner:Volar tconstruct:shuriken:0:jade,jade,jade,jade enderio:item_soul_vial:Leafy Giant + enderio:item_broken_spawner:Revenant enderio:item_soul_vial:Carminite Broodling tconstruct:shuriken:0:fierymetal,fierymetal,fierymetal,fierymetal tconstruct:arrow:0:wood,refinediron,feather @@ -1426,6 +1430,7 @@ advanced { tconstruct:hatchet:0:desert_myrmex,desert_myrmex,desert_myrmex openblocks:tank:rocketfuel; tconstruct:frypan:0:end_steel,end_steel + enderio:item_broken_spawner:Enigmoth extracells:pattern.fluid:zinc;m=0 extracells:pattern.fluid:neutrons;m=0 enderio:item_soul_vial:Sabretooth @@ -1451,6 +1456,7 @@ advanced { extracells:pattern.fluid:fuel_mixed_heavy_heat_1;m=0 tconstruct:hatchet:0:iridium,iridium,iridium tconstruct:hatchet:0:ardite,ardite,ardite + enderio:item_broken_spawner:Barako, the Sun Chief tconstruct:longsword:0:blood_infused_wood,blood_infused_wood,blood_infused_wood tconstruct:broadsword:0:refinedglowstone,refinedglowstone,refinedglowstone tconstruct:rapier:0:weezer,weezer,weezer @@ -1619,6 +1625,7 @@ advanced { enderio:item_broken_spawner:Spider openblocks:tank:fuel_lecm_245_fluoride_flibe; tconstruct:hatchet:0:cactus,cactus,cactus + enderio:item_broken_spawner:entity.companion.name tconstruct:scythe:0:cactus,cactus,cactus,cactus tconstruct:longbow:0:osmium,osmium,osmium,string extracells:pattern.fluid:uranium;m=0 @@ -1646,6 +1653,7 @@ advanced { tconstruct:hatchet:0:mirion,mirion,mirion tconstruct:scythe:0:quartzenrichediron,quartzenrichediron,quartzenrichediron,quartzenrichediron extracells:pattern.fluid:binnie.liqueur.hazelnut;m=0 + enderio:item_broken_spawner:entity.blackfrost.name extracells:pattern.fluid:binnie.juice.banana;m=0 enderio:item_soul_vial:Enchanted Archer tconstruct:pickaxe:0:cyanite,cyanite,cyanite @@ -1661,6 +1669,7 @@ advanced { enderio:item_soul_vial:Chiromaw tconstruct:hatchet:0:integrationforegoing.pink_slime,integrationforegoing.pink_slime,integrationforegoing.pink_slime tconstruct:hammer:0:energetic_alloy,energetic_alloy,energetic_alloy,energetic_alloy + enderio:item_broken_spawner:Ferrous Wroughtnaut openblocks:tank:fluorite_water; tconstruct:shuriken:0:adamantium,adamantium,adamantium,adamantium tconstruct:rapier:0:firewood,firewood,firewood @@ -1778,6 +1787,7 @@ advanced { enderio:item_soul_vial:Glistening Pixon enderio:item_broken_spawner:Sun Spirit extracells:pattern.fluid:europium;m=0 + enderio:item_broken_spawner:Dalek enderio:item_broken_spawner:Skull Creature tconstruct:lumberaxe:0:flint,flint,flint,flint extracells:pattern.fluid:stellar_alloy;m=0 @@ -1906,6 +1916,7 @@ advanced { enderio:item_soul_vial:Precasian Lottoman enderio:item_soul_vial:Paravite tconstruct:longbow:0:dragonsteel_lightning,dragonsteel_lightning,dragonsteel_lightning,string + enderio:item_broken_spawner:Isnachi extracells:pattern.fluid:calcium_sulfate_solution;m=0 openblocks:tank:gluons; enderio:item_broken_spawner:Rock Snot @@ -2836,6 +2847,7 @@ advanced { enderio:item_soul_vial:Avaton openblocks:tank:nightmare_binder_nickel; enderio:item_soul_vial:Armored Giant + enderio:item_broken_spawner:Vespa Brood tconstruct:shortbow:0:chaotic_plustic,chaotic_plustic,string tconstruct:mattock:0:chocolate,chocolate,chocolate tconstruct:longsword:0:platinum,platinum,platinum @@ -3442,6 +3454,7 @@ advanced { forestry:digger_bag tconstruct:frypan:0:iron,iron tconstruct:arrow:0:wood,energetic_alloy,feather + enderio:item_broken_spawner:Flame Imp tconstruct:shortbow:0:ma.prudentium,ma.prudentium,string enderio:item_broken_spawner:Horntail tconstruct:hammer:0:manasteel,manasteel,manasteel,manasteel @@ -3757,6 +3770,7 @@ advanced { plustic:katana:0:blutonium,blutonium,blutonium,blutonium enderio:item_broken_spawner:Icey Ball tconstruct:shovel:0:mod_lavacow.vespa_carapace,mod_lavacow.vespa_carapace,mod_lavacow.vespa_carapace + enderio:item_broken_spawner:Osvermis Spiritus enderio:item_soul_vial:Soulvyre tconstruct:hammer:0:ma.intermedium,ma.intermedium,ma.intermedium,ma.intermedium extracells:pattern.fluid:molten_molybdenum;m=0 @@ -4140,6 +4154,7 @@ advanced { tconstruct:crossbow:0:slime,slime,slime,string tconstruct:shuriken:0:vibrant_alloy,vibrant_alloy,vibrant_alloy,vibrant_alloy tconstruct:mattock:0:copper,copper,copper + enderio:item_broken_spawner:Warmander enderio:item_soul_vial:Wither Skeleton enderio:item_soul_vial:Gecko openblocks:tank:europium; @@ -4189,6 +4204,7 @@ advanced { tconstruct:shortbow:0:lyon,lyon,string enderio:item_broken_spawner:Castle Guardian [NYI] enderio:item_soul_vial:Death Worm + enderio:item_broken_spawner:Grave Robber tconstruct:hammer:0:ma.inferium,ma.inferium,ma.inferium,ma.inferium tconstruct:rapier:0:refinedglowstone,refinedglowstone,refinedglowstone tconstruct:longbow:0:pigiron,pigiron,pigiron,string @@ -4218,6 +4234,7 @@ advanced { enderio:item_broken_spawner:Ancient Golem enderio:item_soul_vial:Clown extracells:pattern.fluid:atomic_nuclei;m=0 + enderio:item_broken_spawner:Frostmaw enderio:item_soul_vial:Sheep tconstruct:battlesign:0:vibranium,vibranium enderio:item_soul_vial:Reaver @@ -4490,6 +4507,7 @@ advanced { extracells:pattern.fluid:limonite;m=0 enderio:item_broken_spawner:Vhraak tconstruct:cleaver:0:adamantium,adamantium,adamantium,adamantium + enderio:item_broken_spawner:Monoclops tconstruct:mattock:0:lead,lead,lead tconstruct:rapier:0:rosidian,rosidian,rosidian tconstruct:cleaver:0:blood_infused_glitch,blood_infused_glitch,blood_infused_glitch,blood_infused_glitch @@ -4900,6 +4918,7 @@ advanced { enderio:item_broken_spawner:Red Guardian enderio:item_broken_spawner:Skele-Elder tconstruct:battlesign:0:refinedglowstone,refinedglowstone + enderio:item_broken_spawner:Foliaath openblocks:tank:alubrass; tconstruct:lumberaxe:0:fusewood_plustic,fusewood_plustic,fusewood_plustic,fusewood_plustic openblocks:tank:twilight_fire; @@ -5495,6 +5514,7 @@ advanced { enderio:item_soul_vial:Cicada tconstruct:longbow:0:rubber,rubber,rubber,string tconstruct:battlesign:0:boron,boron + enderio:item_broken_spawner:Harbinger Cube openblocks:tank:fuel_lep_239; railcraft:dust:2 extracells:pattern.fluid:binnie.liqueur.cherry;m=0 @@ -5559,6 +5579,7 @@ advanced { tconstruct:crossbow:0:limonite,limonite,limonite,string plustic:katana:0:extrabotany:ingotorichalcos,extrabotany:ingotorichalcos,extrabotany:ingotorichalcos,extrabotany:ingotorichalcos openblocks:tank:uranium_238_fluoride_flibe; + enderio:item_broken_spawner:Fire Hydra Head tconstruct:mattock:0:bloodmaster,bloodmaster,bloodmaster enderio:item_broken_spawner:Shyrelands Lottoman enderio:item_soul_vial:Antlion Trove Guardian @@ -5615,6 +5636,7 @@ advanced { tconstruct:battlesign:0:elementium,elementium plustic:laser_gun:0:advancedalloy,advancedalloy,prismarine,manyullyn tconstruct:scythe:0:darkmatter,darkmatter,darkmatter,darkmatter + enderio:item_broken_spawner:Grottol tconstruct:hatchet:0:dragonsteel_ice,dragonsteel_ice,dragonsteel_ice tconstruct:pickaxe:0:amethyst,amethyst,amethyst tconstruct:longsword:0:thaumium,thaumium,thaumium @@ -5778,6 +5800,7 @@ advanced { extracells:pattern.fluid:dimensional_essence;m=0 plustic:laser_gun:0:topaz,topaz,prismarine,manyullyn enderio:item_broken_spawner:Rockrider + enderio:item_broken_spawner:Dread Queen enderio:item_soul_vial:Nightfly openblocks:tank:molten_adamantium; tconstruct:cleaver:0:construction_alloy,construction_alloy,construction_alloy,construction_alloy @@ -5961,6 +5984,7 @@ advanced { extracells:pattern.fluid:evanescent_bifrost;m=0 tconstruct:battlesign:0:blood_infused_glitch,blood_infused_glitch plustic:katana:0:nickel,nickel,nickel,nickel + enderio:item_broken_spawner:Lantern tconstruct:pickaxe:0:blood_infused_iron,blood_infused_iron,blood_infused_iron tconstruct:lumberaxe:0:ma.superium,ma.superium,ma.superium,ma.superium extracells:pattern.fluid:oil_dense_heat_2;m=0 @@ -6115,6 +6139,7 @@ advanced { openblocks:tank:quartz_nak_hot; tconstruct:shovel:0:xu_demonic_metal,xu_demonic_metal,xu_demonic_metal tconstruct:kama:0:emberstone,emberstone,emberstone + enderio:item_broken_spawner:Amber Scarab tconstruct:shortbow:0:dark_steel,dark_steel,string tconstruct:pickaxe:0:mithril,mithril,mithril tconstruct:hammer:0:magmaslime,magmaslime,magmaslime,magmaslime @@ -6233,6 +6258,7 @@ advanced { openblocks:tank:intermedium; tconstruct:shuriken:0:mithril,mithril,mithril,mithril enderio:item_soul_vial:Alicanto + enderio:item_broken_spawner:Lil' Sludge enderio:item_soul_vial:Giant Miner openblocks:tank:fuel_leu_235; plustic:katana:0:silver,silver,silver,silver @@ -6248,6 +6274,7 @@ advanced { tconstruct:crossbow:0:hard_carbon,hard_carbon,hard_carbon,string enderio:item_soul_vial:Botfly tconstruct:lumberaxe:0:titanium,titanium,titanium,titanium + enderio:item_broken_spawner:Amber Lord enderio:item_soul_vial:Kobold extracells:pattern.fluid:sodium;m=0 tconstruct:hammer:0:realmite,realmite,realmite,realmite @@ -6367,6 +6394,7 @@ advanced { enderio:item_broken_spawner:Modulo enderio:item_broken_spawner:Mini Me enderio:item_broken_spawner:Skellox + enderio:item_broken_spawner:entity.dalek_scaro.name tconstruct:broadsword:0:jungle_myrmex,jungle_myrmex,jungle_myrmex enderio:item_broken_spawner:Vinocorne tconstruct:shuriken:0:soularium,soularium,soularium,soularium @@ -6555,6 +6583,7 @@ advanced { tconstruct:broadsword:0:endstone,endstone,endstone plustic:laser_gun:0:knightslime,knightslime,prismarine,manyullyn extracells:pattern.fluid:nobelium;m=0 + enderio:item_broken_spawner:Baby Foliaath tconstruct:shortbow:0:ghostwood_plustic,ghostwood_plustic,string tconstruct:longsword:0:iron,iron,iron enderio:item_broken_spawner:Undead Troll @@ -6661,6 +6690,7 @@ advanced { enderio:item_broken_spawner:Piranha tconstruct:hatchet:0:cyanite,cyanite,cyanite enderio:item_soul_vial:Construct of Strength + enderio:item_broken_spawner:Ghost of Grave Robber enderio:item_broken_spawner:Sand Golem enderio:item_broken_spawner:Nipper openblocks:tank:fuel_lecf_251_fluoride; @@ -6685,6 +6715,7 @@ advanced { openblocks:tank:fuel_heu_233_fluoride_flibe; enderio:item_broken_spawner:Tiny Bird plustic:katana:0:amber,amber,amber,amber + enderio:item_broken_spawner:Fire Hydra tconstruct:pickaxe:0:chocolate,chocolate,chocolate enderio:item_broken_spawner:Arid Warrior tconstruct:shortbow:0:dragonsteel_ice,dragonsteel_ice,string @@ -6969,6 +7000,7 @@ advanced { enderio:item_soul_vial:Floro Lottoman openblocks:tank:binnie.resin; tconstruct:arrow:0:wood,xu_magical_wood,feather + enderio:item_broken_spawner:Barakoana enderio:item_broken_spawner:Fyracryx tconstruct:kama:0:knightmetal,knightmetal,knightmetal tconstruct:kama:0:darkmatter,darkmatter,darkmatter @@ -7000,6 +7032,7 @@ advanced { enderio:item_soul_vial:Snow Guardian enderio:item_broken_spawner:Orbling tconstruct:shovel:0:amber,amber,amber + enderio:item_broken_spawner:Enigmoth Caterpillar extracells:pattern.fluid:glowstone_nak_hot;m=0 enderio:item_broken_spawner:Cleaver tconstruct:excavator:0:wood,wood,wood,wood @@ -7068,6 +7101,7 @@ advanced { openblocks:tank:redstone_nak; plustic:laser_gun:0:yellowgarnet,yellowgarnet,prismarine,manyullyn tconstruct:shovel:0:pigiron,pigiron,pigiron + enderio:item_broken_spawner:Cactoid tconstruct:arrow:0:wood,ghoulish,feather enderio:item_broken_spawner:Green Rune Templar tconstruct:kama:0:iron,iron,iron @@ -7217,6 +7251,7 @@ advanced { tconstruct:shuriken:0:emeradic_actadd_plustic,emeradic_actadd_plustic,emeradic_actadd_plustic,emeradic_actadd_plustic tconstruct:battlesign:0:desert_myrmex,desert_myrmex plustic:laser_gun:0:awakened_plustic,awakened_plustic,prismarine,manyullyn + enderio:item_broken_spawner:Roving Cube enderio:item_broken_spawner:Hydrolisk enderio:item_broken_spawner:Hunter Master enderio:item_broken_spawner:Construct of Terror @@ -7592,6 +7627,7 @@ advanced { openblocks:tank:nitrogen; extracells:pattern.fluid:fuel_lecm_247_fluoride_flibe;m=0 tconstruct:rapier:0:parafrosynium,parafrosynium,parafrosynium + enderio:item_broken_spawner:Wyvern enderio:item_broken_spawner:Arcane Bore enderio:item_soul_vial:Zal Herbalist tconstruct:frypan:0:abyssalnite,abyssalnite @@ -8124,6 +8160,7 @@ advanced { cyclicmagic:exp_pylon tconstruct:shuriken:0:blueslime,blueslime,blueslime,blueslime tinymobfarm:emerald_farm + enderio:item_broken_spawner:Barakoa agricraft:water_tank tconstruct:cleaver:0:conductive_iron,conductive_iron,conductive_iron,conductive_iron extracells:pattern.fluid:decay_inducing_matter;m=0 @@ -8188,6 +8225,7 @@ advanced { tconstruct:battlesign:0:dragonsteel_fire,dragonsteel_fire extracells:pattern.fluid:moltendreadium;m=0 enderio:item_broken_spawner:Cherry Barrager + enderio:item_broken_spawner:Polyphemus tconstruct:kama:0:ma.prosperity,ma.prosperity,ma.prosperity plustic:katana:0:barathosynium,barathosynium,barathosynium,barathosynium tconstruct:excavator:0:mod_lavacow.scythe_claw,mod_lavacow.scythe_claw,mod_lavacow.scythe_claw,mod_lavacow.scythe_claw @@ -8345,6 +8383,7 @@ advanced { techreborn:ingot:2 techreborn:ingot:0 tconstruct:rapier:0:electrical_steel,electrical_steel,electrical_steel + enderio:item_broken_spawner:Ghost Swarmer tconstruct:crossbow:0:skeletal,skeletal,skeletal,string tconstruct:pickaxe:0:ghastly,ghastly,ghastly extracells:pattern.fluid:uranium_233_fluoride_flibe;m=0 @@ -8410,6 +8449,7 @@ advanced { tconstruct:cleaver:0:brass,brass,brass,brass tconstruct:scythe:0:void_actadd_plustic,void_actadd_plustic,void_actadd_plustic,void_actadd_plustic tconstruct:longsword:0:lumium_plustic,lumium_plustic,lumium_plustic + enderio:item_broken_spawner:Sea Hag tconstruct:bolt:0:wood,knightmetal,feather extracells:pattern.fluid:galactic_matter;m=0 nuclearcraft:dust:4 @@ -8611,6 +8651,7 @@ advanced { tconstruct:scythe:0:lyon,lyon,lyon,lyon enderio:item_soul_vial:Bobo tconstruct:scythe:0:abyssalnite,abyssalnite,abyssalnite,abyssalnite + enderio:item_broken_spawner:Cactyrant enderio:item_broken_spawner:Crypt Crawler Tunnel Entrance tconstruct:rapier:0:aluminum,aluminum,aluminum extracells:pattern.fluid:oil;m=0 @@ -8716,4 +8757,3 @@ advanced { > } - diff --git a/config/jei/worldSettings.cfg b/config/jei/worldSettings.cfg index 2ac2e62c..0f08f60b 100644 --- a/config/jei/worldSettings.cfg +++ b/config/jei/worldSettings.cfg @@ -374,7 +374,7 @@ world-288993849 { world-310143583 { # Show the list of bookmarks next to open GUIs. - B:bookmarkOverlayEnabled=true + B:bookmarkOverlayEnabled=false # Give items instead of showing the recipe. B:cheatItemsEnabled=true @@ -384,7 +384,7 @@ world-310143583 { # Hide and unhide ingredients by clicking them in the list. B:editEnabled=false - S:filterText=sashim + S:filterText= # Show the list of ingredients next to open GUIs. B:overlayEnabled=true @@ -581,20 +581,11 @@ world-78688046 { world-830336226 { - # Show the list of bookmarks next to open GUIs. B:bookmarkOverlayEnabled=true - - # Give items instead of showing the recipe. B:cheatItemsEnabled=false - - # Default item to use to fill up fluids when clicking on a fluid ingredient in the menu, (format: item_name@meta) S:defaultFluidContainerItem= - - # Hide and unhide ingredients by clicking them in the list. B:editEnabled=false S:filterText= - - # Show the list of ingredients next to open GUIs. B:overlayEnabled=true } @@ -1562,4 +1553,3 @@ world97320 { B:overlayEnabled=true } - diff --git a/config/modularmachinery/machinery/bee_stargate.json b/config/modularmachinery/machinery/bee_stargate.json new file mode 100644 index 00000000..4013e7be --- /dev/null +++ b/config/modularmachinery/machinery/bee_stargate.json @@ -0,0 +1,1366 @@ +{ + "registryname": "bee_stargate", + "localizedname": "Bee Stargate", + "color": "ccbb8b", + "parts": [ + { + "x": 1, + "y": 3, + "z": 4, + "elements": [ + "contenttweaker:stargate_ring_block@0" + ] + }, + { + "x": 1, + "y": 1, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 2, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -3, + "y": 0, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 5, + "z": 4, + "elements": [ + "contenttweaker:stargate_chevron_block@0" + ] + }, + { + "x": -3, + "y": 0, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -4, + "y": 0, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 1, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 1, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 6, + "z": 4, + "elements": [ + "contenttweaker:stargate_ring_block@0" + ] + }, + { + "x": 3, + "y": 0, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 4, + "y": 0, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 3, + "y": 1, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 0, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 0, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 3, + "y": 0, + "z": 8, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -3, + "y": 1, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -4, + "y": 0, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -3, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 0, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 0, + "z": 0, + "elements": [ + "modularmachinery:blockfluidinputhatch@0" + ] + }, + { + "x": -2, + "y": 3, + "z": 4, + "elements": [ + "contenttweaker:stargate_chevron_block@0" + ] + }, + { + "x": -1, + "y": 1, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 3, + "y": 1, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 0, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 0, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 0, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 7, + "z": 4, + "elements": [ + "contenttweaker:stargate_chevron_block@0" + ] + }, + { + "x": -2, + "y": 4, + "z": 4, + "elements": [ + "contenttweaker:stargate_ring_block@0" + ] + }, + { + "x": -2, + "y": 0, + "z": 8, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 2, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 0, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 2, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 0, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 1, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 2, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 2, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 1, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 4, + "y": 0, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 3, + "y": 0, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 0, + "z": 0, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 0, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 3, + "y": 1, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 3, + "y": 1, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 1, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 1, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 0, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 2, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 1, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 3, + "y": 0, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 0, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 7, + "z": 4, + "elements": [ + "contenttweaker:stargate_ring_block@0" + ] + }, + { + "x": 1, + "y": 0, + "z": 8, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 0, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 1, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 1, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 0, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 2, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 0, + "z": 0, + "elements": [ + "modularmachinery:blockinputbus@0" + ] + }, + { + "x": -2, + "y": 0, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -3, + "y": 0, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 1, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 0, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -3, + "y": 1, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -3, + "y": 1, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 2, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 0, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 2, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 2, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 3, + "y": 0, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 7, + "z": 4, + "elements": [ + "contenttweaker:stargate_chevron_block@0" + ] + }, + { + "x": 0, + "y": 0, + "z": 8, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 4, + "y": 0, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 0, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 1, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 2, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -4, + "y": 0, + "z": 0, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -4, + "y": 0, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 1, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 0, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 4, + "y": 0, + "z": 0, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -3, + "y": 1, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -3, + "y": 1, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 2, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 0, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 0, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 1, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 6, + "z": 4, + "elements": [ + "contenttweaker:stargate_ring_block@0" + ] + }, + { + "x": 0, + "y": 1, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 0, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 2, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -3, + "y": 0, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 7, + "z": 4, + "elements": [ + "contenttweaker:stargate_ring_block@0" + ] + }, + { + "x": -1, + "y": 0, + "z": 8, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 0, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 1, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 2, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 5, + "z": 4, + "elements": [ + "contenttweaker:stargate_chevron_block@0" + ] + }, + { + "x": 3, + "y": 0, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 1, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 2, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -3, + "y": 0, + "z": 0, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 1, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 2, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -4, + "y": 0, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 1, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 3, + "z": 4, + "elements": [ + "contenttweaker:stargate_chevron_block@0" + ] + }, + { + "x": -3, + "y": 0, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 4, + "y": 0, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 4, + "y": 0, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 3, + "y": 1, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 2, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 0, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 1, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 0, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 2, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 4, + "z": 4, + "elements": [ + "contenttweaker:stargate_ring_block@0" + ] + }, + { + "x": 2, + "y": 0, + "z": 8, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -4, + "y": 0, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 2, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -3, + "y": 0, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 0, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 0, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 1, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 0, + "z": 0, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -4, + "y": 0, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 3, + "z": 4, + "elements": [ + "contenttweaker:stargate_ring_block@0" + ] + }, + { + "x": -1, + "y": 1, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -3, + "y": 0, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 0, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 3, + "y": 0, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 1, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 2, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -3, + "y": 0, + "z": 8, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 2, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 2, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 3, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 3, + "y": 0, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -3, + "y": 1, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 4, + "y": 0, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 0, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 2, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 0, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 1, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 3, + "z": 4, + "elements": [ + "contenttweaker:stargate_controller_block@0" + ] + }, + { + "x": 3, + "y": 0, + "z": 0, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -4, + "y": 0, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 1, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 1, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 0, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 1, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 4, + "y": 0, + "z": 5, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 0, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 1, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -4, + "y": 0, + "z": 8, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 2, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 2, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 0, + "y": 0, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -1, + "y": 0, + "z": 3, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 7, + "z": 4, + "elements": [ + "contenttweaker:stargate_chevron_block@0" + ] + }, + { + "x": 4, + "y": 0, + "z": 8, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 3, + "y": 1, + "z": 7, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 2, + "y": 0, + "z": 4, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": -2, + "y": 1, + "z": 6, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + }, + { + "x": 1, + "y": 0, + "z": 2, + "elements": [ + "contenttweaker:stargate_sand@0" + ] + } + ]} \ No newline at end of file diff --git a/config/modularmachinery/machinery/dimensional_stabilizer.json b/config/modularmachinery/machinery/dimensional_stabilizer.json index 0ec091c4..46259133 100644 --- a/config/modularmachinery/machinery/dimensional_stabilizer.json +++ b/config/modularmachinery/machinery/dimensional_stabilizer.json @@ -4,7 +4,7 @@ "color": "000000", "modifiers": [ { - "elements": "bloodmagic:blood_rune@8", + "elements": "contenttweaker:fabric_of_the_orb", "x": 0, "y": 1, "z": 0, diff --git a/config/modularmachinery/machinery/wormhole_field_generator.json b/config/modularmachinery/machinery/wormhole_field_generator.json new file mode 100644 index 00000000..c8ef58a9 --- /dev/null +++ b/config/modularmachinery/machinery/wormhole_field_generator.json @@ -0,0 +1,598 @@ +{ + "registryname": "wormhole_field_generator", + "localizedname": "Wormhole Field Generator", + "color": "dbc8c8", + "parts": [ + { + "x": 1, + "y": 1, + "z": 3, + "elements": [ + "techreborn:storage@3" + ] + }, + { + "x": -2, + "y": 0, + "z": 2, + "elements": [ + "techreborn:storage@3" + ] + }, + { + "x": -3, + "y": 1, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 0, + "y": 4, + "z": 5, + "elements": [ + "contenttweaker:wormhole_field_module@0" + ] + }, + { + "x": 1, + "y": 0, + "z": 5, + "elements": [ + "techreborn:storage@3" + ] + }, + { + "x": -1, + "y": 0, + "z": 6, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": -3, + "y": 4, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 4, + "y": 2, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 0, + "y": 1, + "z": 4, + "elements": [ + "techreborn:storage@3" + ] + }, + { + "x": 1, + "y": 0, + "z": 1, + "elements": [ + "techreborn:storage@3" + ] + }, + { + "x": -3, + "y": 2, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 0, + "y": 0, + "z": 3, + "elements": [ + "modularmachinery:blockenergyinputhatch" + ] + }, + { + "x": -1, + "y": 0, + "z": 4, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 0, + "y": 3, + "z": -1, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 3, + "y": 0, + "z": 4, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": 0, + "y": 1, + "z": 3, + "elements": [ + "techreborn:storage@3" + ] + }, + { + "x": 2, + "y": 0, + "z": 2, + "elements": [ + "techreborn:storage@3" + ] + }, + { + "x": 1, + "y": 0, + "z": 0, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": 0, + "y": 0, + "z": 1, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": -3, + "y": 0, + "z": 4, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": -1, + "y": 1, + "z": 4, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": -2, + "y": 0, + "z": 5, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": 2, + "y": 4, + "z": 3, + "elements": [ + "contenttweaker:wormhole_field_module@0" + ] + }, + { + "x": 0, + "y": 0, + "z": 6, + "elements": [ + "modularmachinery:blockinputbus@0" + ] + }, + { + "x": -2, + "y": 4, + "z": 3, + "elements": [ + "contenttweaker:wormhole_field_module@0" + ] + }, + { + "x": 2, + "y": 0, + "z": 5, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": 3, + "y": 2, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": -1, + "y": 1, + "z": 2, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": 0, + "y": 2, + "z": 3, + "elements": [ + "techreborn:storage@3" + ] + }, + { + "x": -4, + "y": 2, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 1, + "y": 0, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 0, + "y": 0, + "z": 4, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": -3, + "y": 0, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": -1, + "y": 0, + "z": 2, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 0, + "y": 1, + "z": 6, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 3, + "y": 0, + "z": 2, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": -1, + "y": 0, + "z": 1, + "elements": [ + "techreborn:storage@3" + ] + }, + { + "x": 0, + "y": 2, + "z": 6, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 3, + "y": 1, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": -4, + "y": 3, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": -1, + "y": 1, + "z": 3, + "elements": [ + "techreborn:storage@3" + ] + }, + { + "x": 3, + "y": 4, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 0, + "y": 4, + "z": 0, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": -1, + "y": 0, + "z": 5, + "elements": [ + "techreborn:storage@3" + ] + }, + { + "x": 1, + "y": 0, + "z": 6, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": 0, + "y": 4, + "z": 7, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 0, + "y": 1, + "z": 2, + "elements": [ + "techreborn:storage@3" + ] + }, + { + "x": 2, + "y": 0, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": -2, + "y": 0, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 1, + "y": 0, + "z": 4, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 0, + "y": 0, + "z": 2, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": -1, + "y": 0, + "z": 0, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": -2, + "y": 0, + "z": 1, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": 0, + "y": 4, + "z": -1, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": -3, + "y": 0, + "z": 2, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": 0, + "y": 2, + "z": 0, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 0, + "y": 4, + "z": 6, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 4, + "y": 4, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 0, + "y": 2, + "z": 7, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 0, + "y": 0, + "z": 5, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 1, + "y": 1, + "z": 2, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": -4, + "y": 4, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 2, + "y": 0, + "z": 1, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": 1, + "y": 1, + "z": 4, + "elements": [ + "techreborn:storage@10" + ] + }, + { + "x": 3, + "y": 0, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 0, + "y": 1, + "z": 0, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": -1, + "y": 0, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 0, + "y": 4, + "z": 1, + "elements": [ + "contenttweaker:wormhole_field_module@0" + ] + }, + { + "x": 0, + "y": 2, + "z": -1, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": -2, + "y": 0, + "z": 4, + "elements": [ + "techreborn:storage@3" + ] + }, + { + "x": 4, + "y": 3, + "z": 3, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 2, + "y": 0, + "z": 4, + "elements": [ + "techreborn:storage@3" + ] + }, + { + "x": 0, + "y": 3, + "z": 7, + "elements": [ + "techreborn:machine_casing@2" + ] + }, + { + "x": 1, + "y": 0, + "z": 2, + "elements": [ + "techreborn:machine_casing@2" + ] + } + ]} \ No newline at end of file diff --git a/config/modularmachinery/machinery/xp_assimilator.json b/config/modularmachinery/machinery/xp_assimilator.json new file mode 100644 index 00000000..202664cc --- /dev/null +++ b/config/modularmachinery/machinery/xp_assimilator.json @@ -0,0 +1,3254 @@ +{ + "registryname": "xp_assimilator", + "localizedname": "Experience Bath", + "color": "dbcba0", + "parts": [ + { + "x": -4, + "y": 2, + "z": 3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 5, + "y": 0, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -4, + "y": 2, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -4, + "y": 2, + "z": 2, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 5, + "y": 0, + "z": 0, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -4, + "y": 2, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -4, + "y": 2, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 5, + "y": 0, + "z": 1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -4, + "y": 2, + "z": -3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 5, + "y": 0, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": 5, + "y": 0, + "z": -1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -4, + "y": 2, + "z": -2, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -5, + "y": 1, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -5, + "y": 1, + "z": -1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -5, + "y": 1, + "z": 0, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -5, + "y": 1, + "z": 1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -5, + "y": 1, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -2, + "y": 4, + "z": 5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@6" + ] + }, + { + "x": -2, + "y": 4, + "z": -5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@6" + ] + }, + { + "x": -5, + "y": 0, + "z": 1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -5, + "y": 0, + "z": 0, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -5, + "y": 0, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -5, + "y": 0, + "z": -1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -5, + "y": 0, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": 4, + "y": 0, + "z": -1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 4, + "y": 0, + "z": 0, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 4, + "y": 0, + "z": 1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 4, + "y": 0, + "z": 2, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 4, + "y": 0, + "z": -3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 4, + "y": 0, + "z": -2, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -3, + "y": 3, + "z": -4, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": -3, + "y": 3, + "z": -3, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": 6, + "y": 1, + "z": -1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -3, + "y": 3, + "z": 3, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": -3, + "y": 3, + "z": 4, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": 6, + "y": 1, + "z": 1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 6, + "y": 1, + "z": 0, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -6, + "y": 1, + "z": 1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -6, + "y": 1, + "z": 0, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -6, + "y": 1, + "z": -1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -2, + "y": 3, + "z": -5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -2, + "y": 3, + "z": -4, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": -2, + "y": 3, + "z": 5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -2, + "y": 3, + "z": 4, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": 4, + "y": 1, + "z": -3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": 4, + "y": 0, + "z": 3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -5, + "y": 2, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": 4, + "y": 1, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": 4, + "y": 1, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 4, + "y": 1, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 4, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 4, + "y": 1, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": 4, + "y": 1, + "z": 3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -4, + "y": 1, + "z": -3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -4, + "y": 1, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -4, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -4, + "y": 1, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -4, + "y": 1, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -4, + "y": 1, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -4, + "y": 1, + "z": 3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -3, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -3, + "y": 1, + "z": 2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -3, + "y": 1, + "z": 3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -3, + "y": 1, + "z": 4, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -3, + "y": 1, + "z": -3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -5, + "y": 2, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -5, + "y": 2, + "z": -1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -3, + "y": 1, + "z": -2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -3, + "y": 1, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -5, + "y": 2, + "z": 0, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -3, + "y": 1, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -5, + "y": 2, + "z": 1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -3, + "y": 1, + "z": -4, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": 6, + "y": 2, + "z": 1, + "elements": [ + "bewitchment:coquina_brick_stairs@1" + ] + }, + { + "x": 6, + "y": 2, + "z": 0, + "elements": [ + "bewitchment:coquina_brick_stairs@1" + ] + }, + { + "x": 6, + "y": 2, + "z": -1, + "elements": [ + "bewitchment:coquina_brick_stairs@1" + ] + }, + { + "x": 5, + "y": 3, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -6, + "y": 0, + "z": 0, + "elements": [ + "generalized_input_item" + ] + }, + { + "x": -6, + "y": 0, + "z": -1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -6, + "y": 0, + "z": 1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -7, + "y": 1, + "z": 1, + "elements": [ + "bewitchment:coquina_brick_stairs@0" + ] + }, + { + "x": -7, + "y": 1, + "z": 0, + "elements": [ + "bewitchment:coquina_brick_stairs@0" + ] + }, + { + "x": -7, + "y": 1, + "z": -1, + "elements": [ + "bewitchment:coquina_brick_stairs@0" + ] + }, + { + "x": 7, + "y": 1, + "z": 0, + "elements": [ + "bewitchment:coquina_brick_stairs@1" + ] + }, + { + "x": 7, + "y": 1, + "z": -1, + "elements": [ + "bewitchment:coquina_brick_stairs@1" + ] + }, + { + "x": 7, + "y": 1, + "z": 1, + "elements": [ + "bewitchment:coquina_brick_stairs@1" + ] + }, + { + "x": -3, + "y": 0, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -3, + "y": 0, + "z": 3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -3, + "y": 0, + "z": 4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 3, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 3, + "y": 1, + "z": 2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 3, + "y": 1, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 3, + "y": 1, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 3, + "y": 1, + "z": -3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": 4, + "y": 2, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 4, + "y": 2, + "z": 2, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 3, + "y": 1, + "z": -2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 4, + "y": 2, + "z": 3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 3, + "y": 1, + "z": -4, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": 4, + "y": 2, + "z": -3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 4, + "y": 2, + "z": -2, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -2, + "y": 1, + "z": 4, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": 4, + "y": 2, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -2, + "y": 1, + "z": 5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": 4, + "y": 2, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -2, + "y": 1, + "z": 2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -2, + "y": 1, + "z": 3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -2, + "y": 1, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -2, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -3, + "y": 0, + "z": -4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -3, + "y": 0, + "z": -3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -3, + "y": 0, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -3, + "y": 0, + "z": -1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -3, + "y": 0, + "z": 0, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -3, + "y": 0, + "z": 1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -8, + "y": 0, + "z": -1, + "elements": [ + "bewitchment:coquina_brick_stairs@0" + ] + }, + { + "x": -1, + "y": 3, + "z": -5, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": -8, + "y": 0, + "z": 0, + "elements": [ + "bewitchment:coquina_brick_stairs@0" + ] + }, + { + "x": 5, + "y": 3, + "z": -1, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": 5, + "y": 3, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -8, + "y": 0, + "z": 1, + "elements": [ + "bewitchment:coquina_brick_stairs@0" + ] + }, + { + "x": 5, + "y": 3, + "z": 1, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": -2, + "y": 1, + "z": -2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -2, + "y": 1, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -2, + "y": 1, + "z": -4, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -2, + "y": 1, + "z": -3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -2, + "y": 1, + "z": -5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": 5, + "y": 4, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@6" + ] + }, + { + "x": 5, + "y": 4, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@6" + ] + }, + { + "x": 3, + "y": 1, + "z": 3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": 3, + "y": 1, + "z": 4, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -1, + "y": 3, + "z": 5, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": 4, + "y": 3, + "z": -2, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": 4, + "y": 3, + "z": -3, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": 4, + "y": 3, + "z": 3, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": 4, + "y": 3, + "z": 2, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": -2, + "y": 2, + "z": -4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -2, + "y": 2, + "z": -5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -2, + "y": 2, + "z": -2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -2, + "y": 2, + "z": -3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -2, + "y": 2, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -2, + "y": 2, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -2, + "y": 2, + "z": 2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -2, + "y": 2, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -2, + "y": 2, + "z": 4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -2, + "y": 2, + "z": 3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -2, + "y": 2, + "z": 5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": 6, + "y": 0, + "z": 1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 6, + "y": 0, + "z": 0, + "elements": [ + "generalized_input_item" + ] + }, + { + "x": 6, + "y": 0, + "z": -1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 3, + "y": 0, + "z": 4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -4, + "y": 3, + "z": -2, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": -4, + "y": 3, + "z": -3, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": 3, + "y": 0, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 3, + "y": 0, + "z": -1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 3, + "y": 0, + "z": -4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 2, + "y": 4, + "z": -5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@6" + ] + }, + { + "x": 3, + "y": 0, + "z": -3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 3, + "y": 0, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 3, + "y": 0, + "z": 3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 3, + "y": 0, + "z": 0, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 3, + "y": 0, + "z": 1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 2, + "y": 4, + "z": 5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@6" + ] + }, + { + "x": -4, + "y": 3, + "z": 2, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": -4, + "y": 3, + "z": 3, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": 2, + "y": 3, + "z": -5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": 2, + "y": 3, + "z": -4, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": 2, + "y": 3, + "z": 4, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": 2, + "y": 3, + "z": 5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": 1, + "y": 2, + "z": -5, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 1, + "y": 2, + "z": -6, + "elements": [ + "bewitchment:coquina_brick_stairs@2" + ] + }, + { + "x": 0, + "y": 0, + "z": 8, + "elements": [ + "bewitchment:coquina_brick_stairs@3" + ] + }, + { + "x": 0, + "y": 0, + "z": 7, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 0, + "y": 0, + "z": 4, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 0, + "y": 0, + "z": 3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 0, + "y": 0, + "z": 6, + "elements": [ + "generalized_input_fluid" + ] + }, + { + "x": 0, + "y": 0, + "z": 5, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 0, + "y": 0, + "z": -1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 1, + "y": 2, + "z": 6, + "elements": [ + "bewitchment:coquina_brick_stairs@3" + ] + }, + { + "x": 1, + "y": 2, + "z": 5, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 0, + "y": 0, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 1, + "y": 2, + "z": 4, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 0, + "z": 1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 0, + "y": 0, + "z": -4, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 1, + "y": 2, + "z": 3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 0, + "z": -5, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 1, + "y": 2, + "z": 2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 1, + "y": 2, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 0, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 0, + "y": 0, + "z": -3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 1, + "y": 2, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 1, + "y": 2, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 0, + "z": -8, + "elements": [ + "bewitchment:coquina_brick_stairs@2" + ] + }, + { + "x": 1, + "y": 2, + "z": -2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 0, + "z": -6, + "elements": [ + "generalized_input_fluid" + ] + }, + { + "x": 1, + "y": 2, + "z": -3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 1, + "y": 2, + "z": -4, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 0, + "z": -7, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -1, + "y": 0, + "z": -5, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -1, + "y": 0, + "z": -6, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -1, + "y": 0, + "z": -7, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -1, + "y": 0, + "z": -8, + "elements": [ + "bewitchment:coquina_brick_stairs@2" + ] + }, + { + "x": -1, + "y": 0, + "z": -1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -1, + "y": 0, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -1, + "y": 0, + "z": -3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -1, + "y": 0, + "z": -4, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 1, + "y": 1, + "z": -4, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 1, + "y": 1, + "z": -5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": 1, + "y": 1, + "z": -6, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 1, + "y": 1, + "z": -7, + "elements": [ + "bewitchment:coquina_brick_stairs@2" + ] + }, + { + "x": 1, + "y": 1, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 1, + "y": 1, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 1, + "y": 1, + "z": -2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 1, + "y": 1, + "z": -3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 1, + "y": 1, + "z": 4, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 1, + "y": 1, + "z": 3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 1, + "y": 1, + "z": 2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 1, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 1, + "y": 1, + "z": 7, + "elements": [ + "bewitchment:coquina_brick_stairs@3" + ] + }, + { + "x": 1, + "y": 1, + "z": 6, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 1, + "y": 1, + "z": 5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": 1, + "y": 0, + "z": 5, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 1, + "y": 0, + "z": 4, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 1, + "y": 0, + "z": 3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 1, + "y": 0, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 1, + "y": 0, + "z": 1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 1, + "y": 0, + "z": 0, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 1, + "y": 0, + "z": -1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 1, + "y": 0, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 1, + "y": 0, + "z": 8, + "elements": [ + "bewitchment:coquina_brick_stairs@3" + ] + }, + { + "x": 1, + "y": 0, + "z": 7, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 1, + "y": 0, + "z": 6, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 1, + "y": 0, + "z": -3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 1, + "y": 3, + "z": 5, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": 1, + "y": 0, + "z": -4, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 1, + "y": 0, + "z": -5, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 1, + "y": 0, + "z": -6, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 1, + "y": 0, + "z": -7, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 1, + "y": 0, + "z": -8, + "elements": [ + "bewitchment:coquina_brick_stairs@2" + ] + }, + { + "x": -2, + "y": 0, + "z": 3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -2, + "y": 0, + "z": 4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 1, + "y": 3, + "z": -5, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": -2, + "y": 0, + "z": 1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -2, + "y": 0, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -2, + "y": 0, + "z": 5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -2, + "y": 0, + "z": -5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -2, + "y": 0, + "z": -4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -2, + "y": 0, + "z": -1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -2, + "y": 0, + "z": 0, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -2, + "y": 0, + "z": -3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -2, + "y": 0, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 2, + "y": 2, + "z": -5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": 2, + "y": 2, + "z": -4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 2, + "y": 2, + "z": -3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 2, + "y": 2, + "z": -2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 2, + "y": 2, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 2, + "y": 2, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 2, + "y": 2, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 2, + "y": 2, + "z": 2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 2, + "y": 2, + "z": 3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 2, + "y": 2, + "z": 4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 2, + "y": 2, + "z": 5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": 0, + "y": 1, + "z": -7, + "elements": [ + "bewitchment:coquina_brick_stairs@2" + ] + }, + { + "x": -1, + "y": 2, + "z": 6, + "elements": [ + "bewitchment:coquina_brick_stairs@3" + ] + }, + { + "x": 0, + "y": 1, + "z": -5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": 0, + "y": 1, + "z": -6, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 0, + "y": 1, + "z": -3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 1, + "z": -4, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 2, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 2, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 8, + "y": 0, + "z": 1, + "elements": [ + "bewitchment:coquina_brick_stairs@1" + ] + }, + { + "x": 8, + "y": 0, + "z": 0, + "elements": [ + "bewitchment:coquina_brick_stairs@1" + ] + }, + { + "x": -1, + "y": 2, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 8, + "y": 0, + "z": -1, + "elements": [ + "bewitchment:coquina_brick_stairs@1" + ] + }, + { + "x": -1, + "y": 2, + "z": -2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 2, + "z": 5, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -1, + "y": 2, + "z": 4, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 2, + "z": 3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 2, + "z": 2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 1, + "z": 7, + "elements": [ + "bewitchment:coquina_brick_stairs@3" + ] + }, + { + "x": 0, + "y": 1, + "z": 6, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -1, + "y": 2, + "z": -3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 2, + "z": -4, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 2, + "z": -5, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -1, + "y": 2, + "z": -6, + "elements": [ + "bewitchment:coquina_brick_stairs@2" + ] + }, + { + "x": 0, + "y": 1, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 1, + "z": -2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 1, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 1, + "z": 3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 1, + "z": 2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 1, + "z": 5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": 0, + "y": 1, + "z": 4, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -5, + "y": 4, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@6" + ] + }, + { + "x": 3, + "y": 2, + "z": -4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 3, + "y": 2, + "z": -3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 3, + "y": 2, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 3, + "y": 2, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 7, + "y": 0, + "z": -1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 3, + "y": 2, + "z": -2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 3, + "y": 2, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 3, + "y": 2, + "z": 4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 7, + "y": 0, + "z": 1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 7, + "y": 0, + "z": 0, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 3, + "y": 2, + "z": 2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 3, + "y": 2, + "z": 3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 2, + "y": 0, + "z": 5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -5, + "y": 3, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -5, + "y": 3, + "z": -1, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": -5, + "y": 3, + "z": 1, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": -5, + "y": 3, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -1, + "y": 1, + "z": 7, + "elements": [ + "bewitchment:coquina_brick_stairs@3" + ] + }, + { + "x": 5, + "y": 2, + "z": -1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 5, + "y": 2, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": 2, + "y": 0, + "z": -4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 2, + "y": 0, + "z": -5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": 2, + "y": 0, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 2, + "y": 0, + "z": -3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 2, + "y": 0, + "z": 0, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 2, + "y": 0, + "z": -1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 2, + "y": 0, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 5, + "y": 2, + "z": 1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 5, + "y": 2, + "z": 0, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 2, + "y": 0, + "z": 1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 2, + "y": 0, + "z": 4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 2, + "y": 0, + "z": 3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 5, + "y": 2, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -7, + "y": 0, + "z": -1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -7, + "y": 0, + "z": 1, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -7, + "y": 0, + "z": 0, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 0, + "y": 2, + "z": 6, + "elements": [ + "bewitchment:coquina_brick_stairs@3" + ] + }, + { + "x": 0, + "y": 2, + "z": 5, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -1, + "y": 1, + "z": 6, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 0, + "y": 2, + "z": -6, + "elements": [ + "bewitchment:coquina_brick_stairs@2" + ] + }, + { + "x": -1, + "y": 1, + "z": 5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -1, + "y": 1, + "z": 4, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 2, + "z": -4, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 1, + "z": 3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 2, + "z": -5, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 2, + "y": 1, + "z": 4, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -3, + "y": 2, + "z": -4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -1, + "y": 1, + "z": 2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 2, + "y": 1, + "z": 5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -3, + "y": 2, + "z": -3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -1, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -3, + "y": 2, + "z": -2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 1, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -3, + "y": 2, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 1, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 2, + "z": 2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 2, + "y": 1, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 1, + "z": -2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 1, + "z": -3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 2, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 2, + "y": 1, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 2, + "z": 4, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 1, + "z": -4, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 2, + "y": 1, + "z": 2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 2, + "y": 1, + "z": 3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 1, + "z": -5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": 0, + "y": 2, + "z": 3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 1, + "z": -6, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 2, + "y": 1, + "z": -4, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": 0, + "y": 2, + "z": -2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 1, + "z": -7, + "elements": [ + "bewitchment:coquina_brick_stairs@2" + ] + }, + { + "x": 2, + "y": 1, + "z": -3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 2, + "z": -3, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 2, + "y": 1, + "z": -2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 2, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 0, + "y": 2, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": 2, + "y": 1, + "z": -1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -1, + "y": 0, + "z": 3, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -1, + "y": 0, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -1, + "y": 0, + "z": 1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -1, + "y": 0, + "z": 0, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -1, + "y": 0, + "z": 7, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 5, + "y": 1, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -1, + "y": 0, + "z": 6, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -1, + "y": 0, + "z": 5, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 5, + "y": 1, + "z": 0, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": 5, + "y": 1, + "z": -1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -1, + "y": 0, + "z": 4, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -1, + "y": 0, + "z": 8, + "elements": [ + "bewitchment:coquina_brick_stairs@3" + ] + }, + { + "x": -6, + "y": 2, + "z": 1, + "elements": [ + "bewitchment:coquina_brick_stairs@0" + ] + }, + { + "x": -6, + "y": 2, + "z": 0, + "elements": [ + "bewitchment:coquina_brick_stairs@0" + ] + }, + { + "x": -6, + "y": 2, + "z": -1, + "elements": [ + "bewitchment:coquina_brick_stairs@0" + ] + }, + { + "x": 5, + "y": 1, + "z": 2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": 5, + "y": 1, + "z": 1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick1_bewitchment_coquina_bricks_0@7" + ] + }, + { + "x": -4, + "y": 0, + "z": 1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": -4, + "y": 0, + "z": 2, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -4, + "y": 0, + "z": -1, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 3, + "y": 3, + "z": -3, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": -4, + "y": 0, + "z": 0, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick_bewitchment_coquina_bricks_0@11" + ] + }, + { + "x": 2, + "y": 1, + "z": -5, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@2" + ] + }, + { + "x": -4, + "y": 0, + "z": -3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": 3, + "y": 3, + "z": -4, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": -4, + "y": 0, + "z": -2, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -3, + "y": 2, + "z": 0, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -3, + "y": 2, + "z": 1, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -3, + "y": 2, + "z": 2, + "elements": [ + "contenttweaker:bewitched_essence_salts" + ] + }, + { + "x": -3, + "y": 2, + "z": 3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -3, + "y": 2, + "z": 4, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -4, + "y": 0, + "z": 3, + "elements": [ + "bewitchment:coquina_smooth@0" + ] + }, + { + "x": -5, + "y": 4, + "z": -2, + "elements": [ + "unlimitedchiselworks:chisel_stonebrick2_bewitchment_coquina_bricks_0@6" + ] + }, + { + "x": 3, + "y": 3, + "z": 3, + "elements": [ + "chisel:ironpane@11" + ] + }, + { + "x": 3, + "y": 3, + "z": 4, + "elements": [ + "chisel:ironpane@11" + ] + } + ]} \ No newline at end of file diff --git a/config/natura.cfg b/config/natura.cfg index 3674cf26..5ff0b9e5 100644 --- a/config/natura.cfg +++ b/config/natura.cfg @@ -1,6 +1,6 @@ # Configuration file -~CONFIG_VERSION: 0.2 +~CONFIG_VERSION: 0.3 enable-disable { B:"Drop barley seeds from grass"=true @@ -9,6 +9,7 @@ enable-disable { B:"Enable stick variants"=false B:"Enable wheat to flour recipe"=true B:"Generate Amaranth Trees"=true + B:"Generate Apple Trees"=true B:"Generate Ash Clouds"=true B:"Generate Barley Crops"=true B:"Generate Blackberry Bushes"=true @@ -27,6 +28,7 @@ enable-disable { B:"Generate Green Glowshroom"=true B:"Generate Heat Sand"=true B:"Generate Hopseed Trees"=true + B:"Generate Legacy Clouds"=true B:"Generate Maloberry Bushes"=true B:"Generate Maple Trees"=true B:"Generate Overworld Clouds"=true @@ -64,6 +66,7 @@ entities { I:"Nitro Creeper Maximum Spawn Count [default: 6]"=6 I:"Nitro Creeper Minimum Spawn Count [default: 4]"=4 I:"Nitro Creeper Spawn Weight [default: 8]"=8 + B:"Should Imps have more color variants?"=true B:"Should Nitro Creepers explode while moderate fall damage is taken? [default: true]"=true B:"Should Nitro Creepers instantly explode while charged? [default: true]"=true } @@ -83,6 +86,8 @@ retrogen { worldgen { I:"Amaranth Tree Spawn Range"=48 I:"Amaranth Tree Spawn Rarity"=1 + I:"Apple Tree Spawn Range"=48 + I:"Apple Tree Spawn Rarity"=20 I:"Ash Cloud Spawn Height"=40 I:"Ash Cloud Spawn Range"=78 I:"Ash Cloud Spawn Rarity"=8 @@ -119,8 +124,14 @@ worldgen { I:"Maple Tree Spawn Rarity"=10 I:"Nether World Generation Dimension Blacklist" < > + I:"Nether World Generation Dimension Whitelist" < + -1 + > I:"Overworld World Generation Dimension Blacklist" < > + I:"Overworld World Generation Dimension Whitelist" < + 0 + > I:"Raspberry Spawn Range"=64 I:"Raspberry Spawn Rarity"=30 I:"Redwood Tree Spawn Range"=16 @@ -158,4 +169,3 @@ worldgen { > } - diff --git a/config/railway_depot_worker.cfg b/config/railway_depot_worker.cfg index 057ec79f..b2a1bea7 100644 --- a/config/railway_depot_worker.cfg +++ b/config/railway_depot_worker.cfg @@ -1,7 +1,13 @@ # Configuration file general { + # It seems that Railcraft was trying to "fix" fluids from other mods that forgot to register the texture into atlas. + # However, this is known to break some unusual fluid textures, most notably Molten Demon Metal from ExtraUtils2 when Tinkers Construct is also installed. + # This option lets you to control whether you want this "fix" or not. + B:disableFluidTextureFix=true B:useAlternativeFirestoneTicker=true + + # If Fluid Texture Fix is used, set this to true will use an alternative version of the fix, which is compatible with ExtraUtils2. + B:useAlternativeFluidTextureFix=true } - diff --git a/config/splash.properties b/config/splash.properties index d1924f46..51d87912 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Sat Apr 26 10:11:47 PDT 2025 +#Thu May 08 18:19:29 PDT 2025 background=0xBFBFBF memoryGood=0x00091A font=0x960826 @@ -14,4 +14,4 @@ enabled=true resourcePackPath=resources logoOffset=0 forgeTexture=fml\:textures/gui/forge.png -fontTexture=textures/font/ascii.png +fontTexture=textures/font/ascii.png \ No newline at end of file diff --git a/config/stellar_core.cfg b/config/stellar_core.cfg index 3a918625..7a809d7b 100644 --- a/config/stellar_core.cfg +++ b/config/stellar_core.cfg @@ -276,6 +276,7 @@ general { # (Client/Server Performance | Experimental) Asynchronous loading of ItemStack's Capability to improve performance. # Conflict with CensoredASM's `delayItemStackCapabilityInit` option. + # Deprecated: unstable, use at your own risk. B:AsyncItemStackCapabilityInit=true # (Client Performance | Experimental) Deduplicate vertexData array to optimise memory usage. @@ -291,6 +292,9 @@ general { # (Server Performance) Improving BlockStateContainer$BlockStateImplementation#hashCode Performance with hashCode cache. B:BlockStateImplementationHashCodeCache=true + # (Client/Server Performance) Optimize BoundingBox intersect check. + B:BoundingBoxIntersectCheck=true + # (Server Performance) Modified the data structure of capturedBlockSnapshots to a LinkedList to help improve insertion and deletion performance. B:CapturedBlockSnapshotsImprovements=false @@ -310,6 +314,9 @@ general { # (Server Performance) Improving EntityTracker Performance with Improved Data Structures. B:EntityTrackerImprovements=true + # (Server Performance) Include Y distance checks when tracking entities. + B:EntityTrackerIncludeY=false + # (Client Performance | Experimental) A feature from Patcher mod, using protocol CC-BY-NC-SA 4.0, if there are any copyright issues, please contact me to remove it. # Dramatically improves performance by limiting the HUD to a specified FPS, may not be compatible with older devices. # May perform strangely with some HUD Mods. @@ -825,8 +832,12 @@ general { B:RouterECOModeByDefault=true } + draconicevolution { + # This option modifies the way Chaos Islands are generated + B:ChaosIslandChunks=true + } + } } - diff --git a/oresources/aoa3/lang/zh_cn.lang b/oresources/aoa3/lang/zh_cn.lang index 21527a2d..dfc6e050 100644 --- a/oresources/aoa3/lang/zh_cn.lang +++ b/oresources/aoa3/lang/zh_cn.lang @@ -1,12 +1,12 @@ -item.Sapphire.name=[虚无]蓝宝石 -item.Jade.name=[虚无]翡翠 -item.Amethyst.name=[虚无]紫晶 -tile.SapphireOre.name=[虚无]蓝宝石矿石 -tile.AmethystOre.name=[虚无]紫晶矿石 -tile.JadeOre.name=[虚无]翡翠矿石 -tile.JadeBlock.name=[虚无]翡翠块 -tile.SapphireBlock.name=[虚无]蓝宝石块 -tile.AmethystBlock.name=[虚无]紫晶块 +item.Sapphire.name=[飞升]蓝宝石 +item.Jade.name=[飞升]翡翠 +item.Amethyst.name=[飞升]紫晶 +tile.SapphireOre.name=[飞升]蓝宝石矿石 +tile.AmethystOre.name=[飞升]紫晶矿石 +tile.JadeOre.name=[飞升]翡翠矿石 +tile.JadeBlock.name=[飞升]翡翠块 +tile.SapphireBlock.name=[飞升]蓝宝石块 +tile.AmethystBlock.name=[飞升]紫晶块 entity.aoa3.cyclops.name=单眼巨人 tile.LunarOrb.name=月牙宝珠 \ No newline at end of file diff --git a/oresources/avaritiaitem/lang/en_us.lang b/oresources/avaritiaitem/lang/en_us.lang index 7143a6c1..75c4357f 100644 --- a/oresources/avaritiaitem/lang/en_us.lang +++ b/oresources/avaritiaitem/lang/en_us.lang @@ -2,6 +2,10 @@ item.avaritiaitem.fractallite_halite_catalyst.name=Fractallite Halite Catalyst item.avaritiaitem.meatball_man_destruction_fabrial.name=Meatball Man destruction fabrial item.avaritiaitem.self_actualizing_stone.name=Self Actualizing Stone item.avaritiaitem.spatial_processor.name=Ascended Spatial Processor - - +item.avaritiaitem.cosmic_balance.name=Cosmic Balance +item.avaritiaitem.bedrock_blaster.name=Bedrock Blaster +item.avaritiaitem.cosmic_fractal_catalyzer.name=Cosmic Fractal Catalyzer +item.avaritiaitem.cosmic_fractal_harmonizer.name=Cosmic Fractal Harmonizer +item.avaritiaitem.cosmic_halite_cluster.name=Cosmic Halite Cluster +item.avaritiaitem.univocal_halite_cluster.name=Univocal Halite Cluster diff --git a/oresources/avaritiaitem/lang/zh_cn.lang b/oresources/avaritiaitem/lang/zh_cn.lang index 0fe88035..13f94fc3 100644 --- a/oresources/avaritiaitem/lang/zh_cn.lang +++ b/oresources/avaritiaitem/lang/zh_cn.lang @@ -2,6 +2,12 @@ item.avaritiaitem.fractallite_halite_catalyst.name=分形岩晶催化剂 item.avaritiaitem.meatball_man_destruction_fabrial.name=肉丸人毁灭法器 item.avaritiaitem.self_actualizing_stone.name=自显化之石 item.avaritiaitem.spatial_processor.name=飞升空间处理器 +item.avaritiaitem.cosmic_balance.name=寰宇平衡 +item.avaritiaitem.bedrock_blaster.name=基岩爆破枪 +item.avaritiaitem.cosmic_fractal_catalyzer.name=寰宇分形催化剂 +item.avaritiaitem.cosmic_fractal_harmonizer.name=寰宇分形调协剂 +item.avaritiaitem.cosmic_halite_cluster.name=寰宇岩晶簇 +item.avaritiaitem.univocal_halite_cluster.name=单形岩晶簇 diff --git a/oresources/contenttweaker/lang/en_us.lang b/oresources/contenttweaker/lang/en_us.lang index 1a3f4888..c8f71031 100644 --- a/oresources/contenttweaker/lang/en_us.lang +++ b/oresources/contenttweaker/lang/en_us.lang @@ -1473,7 +1473,7 @@ item.contenttweaker.dynatos_star.name=Dynatos Star item.contenttweaker.greed_stone.name=Greed Stone item.contenttweaker.gun_devil_chunk.name=Gun Devil Chunk item.contenttweaker.pharos_callstone.name=Pharos Callstone -item.contenttweaker.gun_devil_callstone.name=Gun Devil Callstone +item.contenttweaker.gun_devil_callstone.name=Worshippers of the Gun Devil Callstone item.contenttweaker.envy_stone.name=Envy Stone item.contenttweaker.upper_fragment_cosmos.name=Upper Fragment of the Cosmos item.contenttweaker.constructor_summoner.name=Dungeon Constructor Summoner @@ -2875,6 +2875,381 @@ tile.contenttweaker.seal_of_freedom.name=Seal of Freedom tile.contenttweaker.ichorium_void_stone.name=Ichorium Void Stone tile.contenttweaker.void_ichorium_rift_cap.name=Void Ichorium Rift Cap tile.contenttweaker.halite_bejewelled_ichorium_catalyst.name=Halite Bejewelled Ichorium Catalyst +fluid.actualizing_fluid=Actualizing Fluid +fluid.ultimate_fractallite_essence=Ultimate Fractallite Essence +fluid.actualization_balance=Actualization of Balance +fluid.actualization_hope=Actualization of Hope +fluid.actualization_knowledge=Actualization of Knowledge +fluid.actualization_glory=Actualization of Glory +fluid.hyperuranion_binder_oxygen=Hyperuarnion Binder: Oxygen +fluid.hyperuranion_binder_hydrogen=Hyperuarnion Binder: Hydrogen +fluid.hyperuranion_binder_deuterium=Hyperuarnion Binder: Deuterium +fluid.hyperuranion_binder_tritium=Hyperuarnion Binder: Tritium +fluid.hyperuranion_binder_iron=Hyperuarnion Binder: Iron +fluid.hyperuranion_binder_nickel=Hyperuarnion Binder: Nickel +fluid.hyperuranion_binder_lead=Hyperuarnion Binder: Lead +fluid.hyperuranion_binder_mercury=Hyperuarnion Binder: Mercury +fluid.hyperuranion_binder_tin=Hyperuarnion Binder: Tin +fluid.high_entropy_hyperdense_plasma=Entropic Hyperdense Plasma +fluid.naquadah_alloy=Molten Naquadah Alloy +fluid.essence_of_sane_thoughts=Essence of Sane Thoughts +fluid.recursive_iced_coffee=Recursive Iced Coffee +fluid.whisper_of_thel=Whisper of Thel +fluid.whisper_of_ahkrast_korvalain=Whisper of Ahkrast Korvalain +fluid.whisper_of_verdith_anath=Whisper of Verdith Anath +fluid.whisper_of_omtose_phellack=Whisper of Omtose Phellack +fluid.whisper_of_donaeth_rusen=Whisper of Donaeth Rusen +fluid.whisper_of_tellan=Whisper of Tellan +fluid.whisper_of_kurald_thyrllan=Whisper of Kurald Thyrllan +fluid.whisper_of_kurald_emurlahn=Whisper of Kurald Emurlahn +fluid.whisper_of_kurald_galain=Whisper of Kurald Galain +fluid.whisper_of_starvald_demelain=Whisper of Starvald Demelain +fluid.gluttonous_abyssite=Gluttonous Abyssite +fluid.arcane_fissile_matter=Arcane Fissile Matter +fluid.apothecary_fissile_matter=Apothecary Fissile Matter +fluid.purified_titanium=Molten Purified Titanium +fluid.starmetal_alloy=Molten Starmetal Alloy +fluid.silvan_fissile_matter=Silvan Fissile Matter +fluid.innerved_fissile_matter=Innerved Fissile Matter +fluid.radiant_fissile_matter=Radiant Fissile Matter +fluid.pre_baryonic_plasma=Pre-Baryonic Plasma +fluid.pure_recursion=Pure Recursion +fluid.warren_binder_hydrogen=Warren Binder: Hydrogen +fluid.warren_binder_oxygen=Warren Binder: Oxygen +fluid.warren_binder_deuterium=Warren Binder: Deuterium +fluid.warren_binder_tritium=Warren Binder: Tritium +fluid.warren_binder_helium=Warren Binder: Helium +fluid.warren_binder_iron=Warren Binder: Iron +fluid.warren_binder_nickel=Warren Binder: Nickel +fluid.warren_binder_lead=Warren Binder: Lead +fluid.warren_binder_mercury=Warren Binder: Mercury +fluid.warren_binder_tin=Warren Binder: Tin +fluid.fractallite_taint=Fractallite Taint +fluid.hungering_flesh_essence=Essence of the Hungering Flesh +fluid.ascended_fluix_essence=Essence of the Ordering Ascension +fluid.mastery_of_undeath=Masterful Undeath Fluid +fluid.infinite_divine_wish=Infinite Divine Wish +fluid.infinite_insane_wish=Infinite Insane Wish +fluid.doped_recursion=Doped Recursion +fluid.low_grade_space_time_fuel=Low-Grade Space-Time Fuel +fluid.medium_grade_space_time_fuel=Medium-Grade Space-Time Fuel +fluid.high_grade_space_time_fuel=High-Grade Space-Time Fuel +fluid.starnge_quark_gluon_plasma=Strange Quark Gluon Plasma +fluid.cosmic_ray_particle_mix=Cosmic Ray Particle Mix +fluid.trinity_ingot=Molten Trinity +fluid.galactic_plasma=Galactic Plasma +fluid.cold_plasma=Entropically-Inert Plasma +fluid.black_hole_juice=Black Hole Juice +fluid.bewitched_essence_salts=Bewitched Essence Salts +item.contenttweaker.astral_insight_10.name=Astral Insight: 10 +item.contenttweaker.astral_insight_20.name=Astral Insight: 20 +item.contenttweaker.astral_insight_30.name=Astral Insight: 30 +item.contenttweaker.astral_insight_40.name=Astral Insight: 40 +item.contenttweaker.astral_insight_50.name=Astral Insight: 50 +item.contenttweaker.astral_insight_60.name=Astral Insight: 60 +item.contenttweaker.astral_insight_70.name=Astral Insight: 70 +item.contenttweaker.astral_insight_80.name=Astral Insight: 80 +item.contenttweaker.astral_insight_90.name=Astral Insight: 90 +item.contenttweaker.astral_insight_100.name=Astral Insight: 100 +item.contenttweaker.spren_summoner_faith.name=Spren Summoner: Disbelief +item.contenttweaker.spren_summoner_death.name=Spren Summoner: Death +item.contenttweaker.spren_summoner_haste.name=Spren Summoner: Haste +item.contenttweaker.spren_summoner_blasphemy.name=Spren Summoner: Blasphemy +item.contenttweaker.spren_summoner_plot.name=Spren Summoner: Plotting +item.contenttweaker.spren_summoner_injury.name=Spren Summoner: Injury +item.contenttweaker.spren_summoner_inadequacy.name=Spren Summoner: Inadequacy +item.contenttweaker.spren_summoner_loneliness.name=Spren Summoner: Loneliness +item.contenttweaker.spren_summoner_control.name=Spren Summoner: Control +item.contenttweaker.spren_summoner_prepotence.name=Spren Summoner: Prepotence +item.contenttweaker.spren_summoner_gluttony.name=Spren Summoner: Gluttony +item.contenttweaker.spren_summoner_arrogance.name=Spren Summoner: Arrogance +item.contenttweaker.spren_summoner_hope.name=Spren Summoner: Hope +item.contenttweaker.spren_summoner_balance.name=Spren Summoner: Balance +item.contenttweaker.spren_summoner_glory.name=Spren Summoner: Glory +item.contenttweaker.spren_summoner_knowledge.name=Spren Summoner: Knowledge +item.contenttweaker.oath_of_the_seven_undead_lords.name=Oath of the Seven Undead Lords +item.contenttweaker.guardians_of_shadesmar_callstone.name=Guardians of Shadesmar Callstone +item.contenttweaker.trinitas_callstone.name=Trinitas Callstone +item.contenttweaker.tainted_prison_key.name=Tainted Prison key +item.contenttweaker.mission_of_undeath_callstone.name=Mission of Undeath Callstone +item.contenttweaker.gun_devil_confrontation_callstone.name=Gun Devil Callstone +item.contenttweaker.universal_constellation_callstone.name=Universal Constellation Callstone +item.contenttweaker.ghost_of_annoyance_callstone.name=Ghost of Annoyance Callstone +item.contenttweaker.strange_stone_callstone.name=Strange Stone Callstone +item.contenttweaker.lively_tree_callstone.name=Lively Tree Callstone +item.contenttweaker.black_hole_juice.name=Black Hole Juice +item.contenttweaker.sashimi_of_the_gate_of_darkness.name=Sashimi of the Gate of Darkness +item.contenttweaker.linked_apple_slice.name=Linked Apple Slice +item.contenttweaker.cleansed_cinnamon_apple.name=Cleansed Cinnamon Apple +item.contenttweaker.tier30_token.name=Tier 30 Excavation Token +item.contenttweaker.infinite_plate_stamp.name=Infinite Plate Stamp +item.contenttweaker.infinite_alchemical_plate.name=Infinite Alchemical Plate +item.contenttweaker.infinite_recursive_plate.name=Infinite Recursive Plate +item.contenttweaker.infinite_entropic_plate.name=Infinite Entropic Plate +item.contenttweaker.cuendillar_plate.name=Cuendillar Plate +item.contenttweaker.fractal_stone_dust.name=Fractal Stone Dust +item.contenttweaker.freed_sky_stone_dust.name=Freed Sky Stone Dust +item.contenttweaker.spatial_compound.name=Spatial Compound +item.contenttweaker.puzzle_solution_freedskystone.name=Puzzle Solution: Freed Sky Stone +item.contenttweaker.alchemical_deep_rock.name=Alchemical Deep Rock +item.contenttweaker.hypercharged_wool.name=Hypercharged Wool +item.contenttweaker.hypercharged_redstone.name=Hypercharged Redstone +item.contenttweaker.core_of_the_mythic_shells.name=Core of the Mythic Shells +item.contenttweaker.actualization_of_glory.name=Actualization of Glory +item.contenttweaker.actualization_of_knowledge.name=Actualization of Knowledge +item.contenttweaker.actualization_of_balance.name=Actualization of Balance +item.contenttweaker.actualization_of_hope.name=Actualization of Hope +item.contenttweaker.unbound_recursium_fragment.name=Unbound Recursium Fragment +item.contenttweaker.embodiment_of_glory.name=Embodiment of Glory +item.contenttweaker.embodiment_of_balance.name=Embodiment of Balance +item.contenttweaker.embodiment_of_hope.name=Embodiment of Hope +item.contenttweaker.embodiment_of_knowledge.name=Embodiment of Knowledge +item.contenttweaker.shard_of_restored_faith.name=Shard of Restored Faith +item.contenttweaker.shard_of_forgotten_fear_of_death.name=Shard of Forgotten Fear of Death +item.contenttweaker.shard_of_forgiven_lost_time.name=Shard of Forgiven Lost Time +item.contenttweaker.shard_of_rekindled_heritage.name=Shard of Rekindled Heritage +item.contenttweaker.shard_of_no_hidden_intentions.name=Shard of Open Intentions +item.contenttweaker.shard_of_physical_healing.name=Shard of Good Physical Health +item.contenttweaker.shard_of_realized_worth.name=Shard of Realized Worth +item.contenttweaker.shard_of_restored_relationship.name=Shard of Restored Relationships +item.contenttweaker.shard_of_surrender.name=Shard of Peaceful Surrender +item.contenttweaker.shard_of_individual_freedom.name=Shard of Individual Freedom +item.contenttweaker.shard_of_controlled_gluttony.name=Shard of Controlled Gulosity +item.contenttweaker.shard_of_humble_education.name=Shard of Humble Erudition +item.contenttweaker.living_shard_of_shadesmar.name=Living Shard of Shadesmar +item.contenttweaker.rune_of_freedom.name=Rune of Freedom +item.contenttweaker.freedomsteel_ingot.name=Freedomsteel Ingot +item.contenttweaker.token_of_the_meatball_man.name=Token of the Meatball Man +item.contenttweaker.finis.name=Finis +item.contenttweaker.recursive_iced_coffee_pot.name=Recursive Iced Coffee Pot +item.contenttweaker.hiddenpowercallstone_loot.name=Loot from Hidden Power Callstone +item.contenttweaker.warren_configurator.name=Warren Configurator +item.contenttweaker.actualized_starlight_sphere.name=Actualized Starlight Sphere +item.contenttweaker.seeker_stone.name=Seeker Stone +item.contenttweaker.reality_pebble.name=Reality Pebble +item.contenttweaker.opalescent_matter.name=Opalescent Matter +item.contenttweaker.unleashed_mithril_1.name=Unleashed Mithril: Lover +item.contenttweaker.unleashed_mithril_2.name=Unleashed Mithril: Loved +item.contenttweaker.unleashed_mithril_3.name=Unleashed Mithril: Love +item.contenttweaker.echo_warren_alloy.name=Echo Warren Alloy Ingot +item.contenttweaker.actualized_warren_alloy.name=Actualized Warren Alloy Ingot +item.contenttweaker.blade_of_the_samurai_queen.name=Blade of the Samurai Bee +item.contenttweaker.alchemical_dust.name=Alchemical Dust +item.contenttweaker.arcane_fissile_alloy.name=Arcane Fissile Alloy +item.contenttweaker.apothecary_fissile_alloy.name=Apothecary Fissile Alloy +item.contenttweaker.silvan_fissile_alloy.name=Silvan Fissile Alloy +item.contenttweaker.innerved_fissile_alloy.name=Innerved Fissile Alloy +item.contenttweaker.radiant_fissile_alloy.name=Radiant Fissile Alloy +item.contenttweaker.depleted_arcane_fissile_alloy.name=Depleted Arcane Fissile Alloy +item.contenttweaker.depleted_apothecary_fissile_alloy.name=Depleted Apothecary Fissile Alloy +item.contenttweaker.depleted_silvan_fissile_alloy.name=Depleted Silvan Fissile Alloy +item.contenttweaker.depleted_innerved_fissile_alloy.name=Depleted Innerved Fissile Alloy +item.contenttweaker.depleted_radiant_fissile_alloy.name=Depleted Radiant Fissile Alloy +item.contenttweaker.arcane_fissile_dust.name=Arcane Fissile Dust +item.contenttweaker.apothecary_fissile_dust.name=Apothecary Fissile Dust +item.contenttweaker.silvan_fissile_dust.name=Silvan Fissile Dust +item.contenttweaker.innerved_fissile_dust.name=Innerved Fissile Dust +item.contenttweaker.radiant_fissile_dust.name=Radiant Fissile Dust +item.contenttweaker.kampylotitum.name=Kampylotitum Ingot +item.contenttweaker.elleipsinyum.name=Elleipsynium +item.contenttweaker.ekkremesynium.name=Ekkremesynium +item.contenttweaker.soul_of_kashan.name=Soul of Kashan +item.contenttweaker.pure_twilight_matter.name=Pure Twilight Matter +item.contenttweaker.shard_of_the_cosmos.name=Shard of the Cosmos +item.contenttweaker.true_tongue_oath.name=Oath in the True Tongue +item.contenttweaker.trinity_runes.name=Trinity Runes +item.contenttweaker.runes_of_the_lover.name=Runes of the Lover +item.contenttweaker.runes_of_the_loved.name=Runes of the Loved +item.contenttweaker.runes_of_the_love.name=Runes of the Love +item.contenttweaker.stone_of_the_lover.name=Stone of the Lover +item.contenttweaker.stone_of_the_loved.name=Stone of the Loved +item.contenttweaker.stone_of_the_love.name=Stone of the Love +item.contenttweaker.call_of_the_lover.name=Call of the Lover +item.contenttweaker.call_of_the_loved.name=Call of the Loved +item.contenttweaker.call_of_the_love.name=Call of the Love +item.contenttweaker.puzzle_solution_cherubim.name=Puzzle Solution: Trinitas Cherubims +item.contenttweaker.unleashed_triquetra.name=Unleashed Triquetra +item.contenttweaker.cuendillar_catalyst_1.name=Cuendillar Catalyst of the Lover +item.contenttweaker.cuendillar_catalyst_2.name=Cuendillar Catalyst of the Loved +item.contenttweaker.cuendillar_catalyst_3.name=Cuendillar Catalyst of the Love +item.contenttweaker.singular_fractal.name=Singular Fractal +item.contenttweaker.infinite_processor.name=Infinite Processor +item.contenttweaker.recursive_quantum.name=Recursive Quantum +item.contenttweaker.fractallite_quantum.name=Fractallite Quantum +item.contenttweaker.plate_clump_recursive.name=Recursive Quantum Clump +item.contenttweaker.plate_clump_fractal.name=Fractal Quantum Clump +item.contenttweaker.slightly_dense_pebble.name=A Slightly Dense Pebble +item.contenttweaker.standard_of_the_shyre_empire.name=Standard of the Shyre Empire +item.contenttweaker.spooder_glasses.name=Spooder Glasses +item.contenttweaker.massive_boomboom.name=Massive Boom-Boom +item.contenttweaker.emc_crown.name=EMC Crown +item.contenttweaker.cosmic_pot.name=Cosmic Pot +item.contenttweaker.recursion_of_the_lover.name=Recursion of the Lover +item.contenttweaker.recursion_of_the_loved.name=recursion of the Loved +item.contenttweaker.recursion_of_the_love.name=Recursion of the Love +item.contenttweaker.atomic_glasses.name=Atomic Glasses +item.contenttweaker.cool_walking_stick.name=Cool Walking Stick +item.contenttweaker.horrible_unedited_fanfiction.name=Horrible Unedited Fanfiction +item.contenttweaker.null_pointer.name=Null Pointer +item.contenttweaker.p0rtals_redish_white_hat.name=P0rtal's Redish White Hat +item.contenttweaker.collar_bells.name=Collar Bells +item.contenttweaker.shield_of_the_arbiter.name=Shield of the Arbiter +item.contenttweaker.trinity_ingot.name=Trinity Ingot +item.contenttweaker.big_bang_matter.name=Big Bang Matter +item.contenttweaker.ascended_gallifreyan_alloy.name=Ascended Gallifreyan Alloy Ingot +item.contenttweaker.token_of_forgiveness.name=Token of Forgiveness +item.contenttweaker.offer_of_restored_balance.name=Offer of Restored Balance +item.contenttweaker.gem_of_pure_taint.name=Gem of Pure Taint +item.contenttweaker.tainted_claw.name=Tainted Claw +item.contenttweaker.void_chains.name=Void Chains +item.contenttweaker.void_ichorium_gem.name=Void Ichorium Gem +item.contenttweaker.charm_of_the_falling_tower.name=Charm of the Falling Tower +item.contenttweaker.multiblock_input_swapping.name=Multiblock Input Swapping +item.contenttweaker.cursed_dragon_egg.name=Cursed Dragon Egg +item.contenttweaker.tainted_alchemic_catalyst.name=Tainted Alchemic Catalyst +item.contenttweaker.recursion_of_taint.name=Recursion of Taint +item.contenttweaker.shield_of_the_king_in_Purple.name=Shield of the King in Purple +item.contenttweaker.taint_shield.name=Taint Shield +item.contenttweaker.taint_gun.name=Taint Gun +item.contenttweaker.the:ultimate_taint_gun.name=The Ultimate Taint Gun +item.contenttweaker.uncanny_void_cluster.name=Uncanny Void Cluster +item.contenttweaker.puzzle_solution_undeadsoil.name=Puzzle SOlution: Undead Soil +item.contenttweaker.respect_of_the_lord_of_lust.name=Respect of the Lord of Lust +item.contenttweaker.respect_of_the_lord_of_pride.name=Respect of the Lord of Pride +item.contenttweaker.respect_of_the_lord_of_envy.name=Respect of the Lord of Envy +item.contenttweaker.respect_of_the_lord_of_greed.name=Respect of the Lord of Greed +item.contenttweaker.respect_of_the_lord_of_wrath.name=Respect of the Lord of Wrath +item.contenttweaker.respect_of_the_lord_of_sloth.name=Respect of the Lord of Sloth +item.contenttweaker.oath_of_the_lord_of_gluttony.name=Oath of the Lord of Gluttony +item.contenttweaker.respect_of_death.name=Respect of Death +item.contenttweaker.puzzle_solution_vowtodeath.name=Puzzle Solution: Vow to Death +item.contenttweaker.fractallite_taint.name=Fractallite Taint +item.contenttweaker.recursion_of_gluttony.name=Recursion of Gluttony +item.contenttweaker.wish_of_infinity.name=Wish of Infinity +item.contenttweaker.ingot_of_infinite_wishes.name=Ingot of Infinite Wishes +item.contenttweaker.gun_devil_limb.name=Gun Devil Limb +item.contenttweaker.bullet_of_the_gun_devil.name=Bullet of the Gun devil +item.contenttweaker.magazine_of_the_gun_devil.name=Magazine of the Gun Devil +item.contenttweaker.universal_constellation.name=Universal Constellation +item.contenttweaker.dust_of_infinite_wishes.name=Dust of Infinite Wishes +item.contenttweaker.eleint_stone.name=Stone of the Eleint +item.contenttweaker.gem_of_dimensional_ascension.name=Gem of Dimensional Ascension +item.contenttweaker.puzzle_solution_dimensionalascension.name=Puzzle Solution: Dimensional AScension +item.contenttweaker.recursion_of_dimensional_ascension.name=Recursion of Dimensional Ascension +item.contenttweaker.infinite_tainted_plate.name=Infinite Tainted Plate +item.contenttweaker.fiery_recursion_fragment.name=Fiery Recursion Fragment +item.contenttweaker.everburning_dust.name=Everburning Dust +item.contenttweaker.everburning_recursion_fragment.name=Everburning Recursion Fragment +item.contenttweaker.everburning_plating.name=Everburning Plating +item.contenttweaker.quasar_charged_gem.name=Quasar Charged Gem +item.contenttweaker.gravitational_time_crystal.name=Gravitational Time Crystal +item.contenttweaker.time_crystal_lattice.name=Time Crystal Lattice +item.contenttweaker.warren_plate.name=Warren Plate +item.contenttweaker.shield_of_the_king_in_purple.name=Shield of the King in Purple +item.contenttweaker.the_ultimate_taint_gun.name=The Ultimate Taint Gun +item.contenttweaker.power_wrought_brightsteel_alloy_plate.name=Power-Wrought Brightsteel Alloy Plate +item.contenttweaker.quasar_charged_dust.name=Quasar-Charged Dust +item.contenttweaker.cleansed_brightsteel_alloy_plate.name=Cleansed Brightsteel Alloy Plate +item.contenttweaker.dimensionally_ascended_garnet.name=Dimensionally Ascended Garnet +item.contenttweaker.alchemically_hyperactive_crystal.name=Alchemically Hyperactive Crystal +item.contenttweaker.dark_matter_scattering_element.name=Dark Matter Scattering Element +item.contenttweaker.fractal_metal_clump.name=Fractal Metal Clump +item.contenttweaker.fractal_metal_plate.name=Fractal Metal Plate +item.contenttweaker.trinity_nugget.name=Trinity Nugget +item.contenttweaker.echo_warren_bar.name=Echo Warren Bar +item.contenttweaker.galaxy_superconductor.name=Galaxy Superconductor +item.contenttweaker.fractallite_focus_lens.name=Fractallite Focus Lens +item.contenttweaker.cosmic_string_primer.name=Cosmic String Primer +item.contenttweaker.cosmic_string.name=Cosmic String +item.contenttweaker.nightmare_of_annoyance.name=Nightmare of Annoyance +item.contenttweaker.strange_stone_essence.name=Strange Stone Essence +item.contenttweaker.neutronium_pearl.name=Neutronium Pearl +item.contenttweaker.mixed_metal_shard.name=Mixed Metal Shard +item.contenttweaker.black_hole_alloy_clump.name=Black Hole Alloy Clump +item.contenttweaker.softened_black_hole_alloy_clump.name=Softened Black Hole Alloy Clump +item.contenttweaker.drawn_black_hole_alloy_clump.name=Drawn Black Hole Alloy Clump +item.contenttweaker.quenched_black_hole_alloy_clump.name=Quenched Black Hole Alloy Clump +item.contenttweaker.black_hole_alloy_ingot.name=Black Hole Alloy Ingot +item.contenttweaker.galactic_core.name=Galactic Core +item.contenttweaker.galactic_power_unit.name=Galactic Power Unit +item.contenttweaker.cosmic_string_conduit.name=Cosmic String Conduit +item.contenttweaker.eye_of_harmony_power_unit.name=Eye of Harmony Power Unit +item.contenttweaker.defined_bar.name=Defined Bar +item.contenttweaker.salt_of_knowledge.name=Salt of Knowledge +item.contenttweaker.clearing_taint.name=Clearing Taint +item.contenttweaker.lost_cities_worldgen.name=Found in the Lost Cities +item.contenttweaker.experience_configurator.name=Experience Configurator +item.contenttweaker.stone_of_dimensional_ascension.name=Stone of Dimensional Ascension +item.contenttweaker.astral_mastery_tome.name=Tome of Astral Mastery +item.contenttweaker.master_spell_infernum.name=Master Spell: Infernum +item.contenttweaker.master_spell_sonus.name=Master Spell: Sonus +item.contenttweaker.master_spell_gognitio.name=Master Spell: Cognitio +item.contenttweaker.white_hole_core.name=White Hole Core +item.contenttweaker.quasar_core.name=Quasar Core +item.contenttweaker.call_to_mission.name=Call to Mission +item.contenttweaker.summons_of_the_realmshifter_cherubim.name=Summons to the Realmshifter Cherubims +item.contenttweaker.prayer_to_the_trinity_of_love.name=Plea to the Trinity of Love +item.contenttweaker.key_of_restored_balance.name=Key of Restored Balance +item.contenttweaker.void_ichorium_jewel.name=Void Ichorium Jewel +item.contenttweaker.void_ichorium_rift.name=Void Ichorium Rift +item.contenttweaker.summons_to_the_meatball_man.name=Summons to the Meatball Man +item.contenttweaker.vow_to_death.name=Vow to Death +tile.contenttweaker.ascended_spatial_chassis.name=Ascended Spatial Chassis +tile.contenttweaker.actualizing_casing.name=Actualizing Casing +tile.contenttweaker.hyperuranion_actualized_naquadah.name=Hyperuranion Actualizer: Naquadah +tile.contenttweaker.hyperuranion_actualized_dragonsteel.name=Hyperuranion Actualizer: Dragonsteel +tile.contenttweaker.hyperuranion_actualized_dimshard.name=Hyperuranion Actualizer: Dimensional Shards +tile.contenttweaker.hyperuranion_actualized_rhenia.name=Hyperuranion Actualizer: Rhenium +tile.contenttweaker.recursive_brain.name=Recursive Brain +tile.contenttweaker.recursive_brain_plug.name=Recursive Brain Plug +tile.contenttweaker.hyperuranion_conduit.name=Hyperuranion Conduit +tile.contenttweaker.hyperuranion_casing.name=Hyperuranion Casing +tile.contenttweaker.horizon_sustainer.name=Horizon Sustainer +tile.contenttweaker.dyson_extruder.name=Dyson Extruder +tile.contenttweaker.exotic_absorber.name=Exotic Absorber +tile.contenttweaker.exotic_dyson_conduit.name=Exotic Dyson Conduit +tile.contenttweaker.mortum_livingrock.name=Mortum Livingrock +tile.contenttweaker.mortum_livingwood.name=Mortum Livingwood +tile.contenttweaker.focused_plasma_collider.name=Focused Plasma Collider +tile.contenttweaker.superfocused_plasma_collider.name=Superfocused Plasma Collider +tile.contenttweaker.hyperfocused_plasma_collider.name=Hyperfocused Plasma Collider +tile.contenttweaker.stormlight_stone.name=Stormlight Stone +tile.contenttweaker.stone_of_shadesmar.name=Stone of Shadesmar +tile.contenttweaker.catalyst_of_the_warrens.name=Catalyst of the Warrens +tile.contenttweaker.absolutely_autentic_rainbowgen.name=Absolutely Authentic Rainbow Generator +tile.contenttweaker.balanced_machine_casing.name=Balanced Machine Casing +tile.contenttweaker.gallifreyan_neutronium_casing.name=Gallifreyan Neutronium Casing +tile.contenttweaker.quark_neutronium_module.name=Quark Neutronium Module +tile.contenttweaker.hyperuranium_actualizer_ichor.name=Hyperuranion Actualizer: Ichor +tile.contenttweaker.undead_soil.name=Undead Soil +tile.contenttweaker.fractallite_halite_stone.name=Fractallite Halite Stone +tile.contenttweaker.catalyst_of_balance.name=Catalyst of Balance +tile.contenttweaker.space_time_beam.name=Space-Time Beam +tile.contenttweaker.quasar_stabilizer.name=Quasar Stabilizer +tile.contenttweaker.quasar_screen.name=Quasar Screen +tile.contenttweaker.galaxy_conduit.name=Galaxy Conduit +tile.contenttweaker.echo_warren_stone.name=Echo Warren Stone +tile.contenttweaker.galaxy_accelerator.name=Galaxy Accelerator +tile.contenttweaker.miniature_quasar.name=Miniature Quasar +tile.contenttweaker.ascended_fluix_etcher.name=Ascended Fluix Etcher +tile.contenttweaker.naquadah_casing.name=Naquadah Casing +tile.contenttweaker.dark_matter_node.name=Dark Matter Node +tile.contenttweaker.cosmic_balance_coil.name=Cosmic Balance Coil +tile.contenttweaker.toroid_galaxy_tube.name=Toroid Galaxy Tube +tile.contenttweaker.stone_of_worthiness.name=Stone of Worthiness +tile.contenttweaker.recurring_nightmare_block.name=Recurring Nightmare Block +tile.contenttweaker.trinity_neutronium_casing.name=Trinity Neutronium Casing +tile.contenttweaker.quark_cosmic_module.name=Cosmic String Module +tile.contenttweaker.tardis_casing.name=Tardis Casing +tile.contenttweaker.tardis_stem.name=Tardis Stem +tile.contenttweaker.tardis_branch.name=Tardis Branch +tile.contenttweaker.tardis_polyp.name=Tardis Polyp +tile.contenttweaker.nineteen_blocks.name=Nineteen Blocks +tile.contenttweaker.wormhole_field_module.name=Wormhole Field Module +tile.contenttweaker.fabric_of_the_orb.name=Fabric of the Orb +tile.contenttweaker.miniature_white_hole.name=Miniature White Hole +item.contenttweaker.supercharged_signalum.name=Supercharged Signalum Ingot +item.contenttweaker.charged_signalum.name=Charged Signalum Ingot diff --git a/oresources/contenttweaker/lang/zh_cn.lang b/oresources/contenttweaker/lang/zh_cn.lang index 626adf6c..de95f19a 100644 --- a/oresources/contenttweaker/lang/zh_cn.lang +++ b/oresources/contenttweaker/lang/zh_cn.lang @@ -211,7 +211,7 @@ tile.contenttweaker.tartarite_monolith.name=魂石巨石块 tile.contenttweaker.high_energy_ray_collector.name=高能射线收集器 tile.contenttweaker.gaia_spirit_block.name=盖亚魂块 tile.contenttweaker.dark_mithrillium_block.name=暗黑秘银块 -tile.contenttweaker.linear_accelerator_tube.name=线性加速管 +tile.contenttweaker.linear_accelerator_tube.name=线性加速器管道 tile.contenttweaker.crystevian_crystal.name=晶体水晶 tile.contenttweaker.ogerite_ore.name=食人魔金属矿石 tile.contenttweaker.mythic_machine_case.name=神秘机械外壳 @@ -252,7 +252,7 @@ fluid.lymph_of_pixonia=光精界淋巴液 fluid.galactic_matter=澎湃递归精华 fluid.milkiest_chocolate=纯牛奶巧克力 fluid.alchemical_goo=炼金粘液 -fluid.twilight_matter=暮色物质 +fluid.twilight_matter=暮光物质 fluid.weakened_cryotheoum=弱化凛冰 fluid.lving_gold_nak=活金钠钾溶液 fluid.living_gold_nak=活金钠钾溶液 @@ -310,7 +310,7 @@ item.contenttweaker.twilight_essence.name=暮色精华 item.contenttweaker.blue_gemstone_egg.name=蓝色宝石蛋 item.contenttweaker.twilight_gear.name=暮色齿轮 item.contenttweaker.instant_power_junction.name=即时导能枢纽 -item.contenttweaker.fire_construct.name=火焰构装体 +item.contenttweaker.fire_construct.name=火焰构造体 item.contenttweaker.living_case.name=活物 item.contenttweaker.annealed_high_density_frame.name=退火高密度框架 item.contenttweaker.aeldunari.name=暗龙之心 @@ -495,7 +495,7 @@ item.contenttweaker.iromine_garnet.name=黄金石榴石 item.contenttweaker.solidified_memory.name=固化记忆 item.contenttweaker.deinthos.name=恐灾 item.contenttweaker.varsium_egg.name=超金蛋 -item.contenttweaker.ice_construct.name=寒冰构装体 +item.contenttweaker.ice_construct.name=寒冰构造体 item.contenttweaker.tier_v_defined_seed.name=T5 定义种子 item.contenttweaker.divine_star.name=神圣之星 item.contenttweaker.crystallite_egg.name=微晶蛋 @@ -604,13 +604,13 @@ entity.cold_iron_chicken.name=寒铁鸡 entity.palladium_chicken.name=钯鸡 entity.polonium_chicken.name=钋鸡 entity.baronyte_chicken.name=爵士鸡 -entity.sapphire_chicken.name=[虚无]蓝宝石鸡 +entity.sapphire_chicken.name=[飞升]蓝宝石鸡 entity.lyon_chicken.name=焦铁鸡 entity.rosite_chicken.name=玫石鸡 entity.bloodgem_chicken.name=血宝石鸡 entity.varsium_chicken.name=超金鸡 entity.glitch_chicken.name=故障鸡 -entity.amethyst_chicken.name=[虚无]紫晶鸡 +entity.amethyst_chicken.name=[飞升]紫晶鸡 entity.emberstone_chicken.name=余烬石鸡 entity.arlemite_chicken.name=阿勒石鸡 entity.crystallite_chicken.name=微晶鸡 @@ -626,7 +626,7 @@ entity.vityte_chicken.name=生机金属鸡 entity.ogerite_chicken.name=食人魔金属鸡 entity.brightsteel_chicken.name=星钢鸡 entity.blazium_chicken.name=烈焰鸡 -entity.jade_chicken.name=[虚无]翡翠鸡 +entity.jade_chicken.name=[飞升]翡翠鸡 entity.mystite_chicken.name=神秘鸡 entity.unidentified_chicken.name=未定义鸡 entity.lunastone_chicken.name=月石鸡 @@ -1423,17 +1423,17 @@ item.contenttweaker.rubidium_egg.name=铷蛋 item.contenttweaker.curious_bullet.name=奇异子弹 item.contenttweaker.oi_spinel.name=奥伊尖晶石 item.contenttweaker.lord_summoner.name=瓦提库斯领主召唤器 -item.contenttweaker.pride_stone.name=傲慢石 +item.contenttweaker.pride_stone.name=傲慢之石 item.contenttweaker.nightmare_gem.name=噩梦宝石 item.contenttweaker.lower_fragment_cosmos.name=寰宇碎片（下） -item.contenttweaker.sloth_stone.name=懒惰石 +item.contenttweaker.sloth_stone.name=怠惰之石 item.contenttweaker.caesium_egg.name=铯蛋 item.contenttweaker.ghastly_egg.name=阴森蛋 item.contenttweaker.strange_charm.name=奇特护符 item.contenttweaker.stable_orbiting_device.name=稳定轨道设备 item.contenttweaker.hator_spinel.name=哈托尔尖晶石 item.contenttweaker.ptah_spinel.name=普塔尖晶石 -item.contenttweaker.gluttony_stone.name=暴食石 +item.contenttweaker.gluttony_stone.name=暴食之石 item.contenttweaker.bee_helmet.name=蜜蜂头盔 item.contenttweaker.bee_leggings.name=蜜蜂护腿 item.contenttweaker.demonologist_callstone.name=恶魔学者召唤石 @@ -1448,8 +1448,8 @@ item.contenttweaker.orcus_spinel.name=奥迦斯尖晶石 item.contenttweaker.gravity_manipulator_device.name=引力场控制器 item.contenttweaker.trinity_callstone.name=三一召唤石 item.contenttweaker.anemic_callstone.name=贫血召唤石 -item.contenttweaker.wrath_stone.name=暴怒石 -item.contenttweaker.lust_stone.name=色欲石 +item.contenttweaker.wrath_stone.name=暴怒之石 +item.contenttweaker.lust_stone.name=色欲之石 item.contenttweaker.baku_heart.name=貘之心 item.contenttweaker.singular_gravity_honey.name=奇点引力蜂蜜 item.contenttweaker.unburied_callstone.name=未葬召唤石 @@ -1470,11 +1470,11 @@ item.contenttweaker.spinel_ring.name=尖晶石指环 item.contenttweaker.ghoulish_egg.name=恐惧蛋 item.contenttweaker.armorer_callstone.name=装甲召唤石 item.contenttweaker.dynatos_star.name=强能之星 -item.contenttweaker.greed_stone.name=贪婪石 +item.contenttweaker.greed_stone.name=贪婪之石 item.contenttweaker.gun_devil_chunk.name=枪之恶魔碎块 item.contenttweaker.pharos_callstone.name=星炬召唤石 -item.contenttweaker.gun_devil_callstone.name=枪之恶魔召唤石 -item.contenttweaker.envy_stone.name=嫉妒石 +item.contenttweaker.gun_devil_callstone.name=枪之恶魔崇拜者召唤石 +item.contenttweaker.envy_stone.name=嫉妒之石 item.contenttweaker.upper_fragment_cosmos.name=寰宇碎片（上） item.contenttweaker.constructor_summoner.name=地牢构建者召唤器 tile.contenttweaker.energy_hive.name=能量蜂巢 @@ -1554,7 +1554,7 @@ item.contenttweaker.enchdesc_looting.name=魔咒描述：抢夺 item.contenttweaker.enchdesc_eternal_compass.name=魔咒描述：永恒罗盘 item.contenttweaker.enchdesc_blast_protection.name=魔咒描述：爆炸保护 item.contenttweaker.enchdesc_rive.name=魔咒描述：裂解 -item.contenttweaker.enchdesc_crush.name=魔咒描述：[虚无]粉碎 +item.contenttweaker.enchdesc_crush.name=魔咒描述：[飞升]粉碎 item.contenttweaker.enchdesc_unstable.name=魔咒描述：震荡不定 item.contenttweaker.enchdesc_scorching_heat.name=魔咒描述：灼热 item.contenttweaker.enchdesc_headhunter.name=魔咒描述：猎头人 @@ -2145,7 +2145,7 @@ tile.contenttweaker.headstone.name=似龙碑石 tile.contenttweaker.runic_ore.name=符文矿石 tile.contenttweaker.catalyzed_runic_ore.name=催化符文矿石 item.contenttweaker.gem_of_voracity.name=贪食宝石 -item.contenttweaker.apothecary_prison_key.name=药剂师监狱钥匙 +item.contenttweaker.apothecary_prison_key.name=药师监狱钥匙 item.contenttweaker.voraceous_worm_callstone.name=贪食野兽召唤石 item.contenttweaker.dreadful_prison_key.name=怖惧监狱钥匙 item.contenttweaker.wyvern_monument_activation_fabrial.name=飞龙神殿激活法器 @@ -2165,9 +2165,9 @@ item.contenttweaker.level30.name=30级 item.contenttweaker.level5.name=5级 item.contenttweaker.wyvern_head_stone.name=飞龙碑石 item.contenttweaker.right_click_with_lots_of_infusionstones.name=使用注魔石右击聚合台制作能量石 -item.contenttweaker.apothecary_stone.name=药剂师之石 -item.contenttweaker.infused_apothecary_stone.name=注魔药剂师之石 -item.contenttweaker.puzzle_solution_apothecaryprisonkey.name=谜题答案：药剂师监狱钥匙 +item.contenttweaker.apothecary_stone.name=药师之石 +item.contenttweaker.infused_apothecary_stone.name=注魔药师之石 +item.contenttweaker.puzzle_solution_apothecaryprisonkey.name=谜题答案：药师监狱钥匙 item.contenttweaker.dragon_will_fragment.name=龙之意志碎片 item.contenttweaker.whispering_heart_of_hearts.name=低语心中之心 item.contenttweaker.soul_of_the_dragonslayer.name=屠龙者之魂 @@ -2194,7 +2194,7 @@ item.contenttweaker.infused_dread_shard.name=怖惧亡灵碎片 item.contenttweaker.second_order_mythic_fractal.name=二阶神话分形 item.contenttweaker.catalyzation_chamber.name=催化室 item.contenttweaker.draconian_metal_clump.name=似龙金属碎块 -item.contenttweaker.empowered_apothecary_stone.name=注魔药剂师之石 +item.contenttweaker.empowered_apothecary_stone.name=注魔药师之石 item.contenttweaker.draconian_metal_ingot.name=似龙金属锭 item.contenttweaker.lunar_star.name=月球之星 item.contenttweaker.pressed_spice.name=压制香料 @@ -2246,11 +2246,11 @@ item.contenttweaker.fourth_order_mythic_fractal.name=四阶神话分形 item.contenttweaker.pearlescent_artifact.name=璀璨神器 item.contenttweaker.digital_matter_transmission_module.name=数字物质传输模块 item.contenttweaker.phasing_snowflake.name=相位雪花手里剑 -item.contenttweaker.phasing_fluix_construct.name=相位福鲁伊克斯构装体 +item.contenttweaker.phasing_fluix_construct.name=相位福鲁伊克斯构造体 item.contenttweaker.master_wizardry_catalyst.name=巫术大师催化剂 item.contenttweaker.petrified_fluix.name=石化福鲁伊克斯 -item.contenttweaker.attuned_fluix_construct.name=调谐福鲁伊克斯构装体 -item.contenttweaker.puzzle_solution_attunedfluixconstruct.name=谜题答案：调谐福鲁伊克斯构装体 +item.contenttweaker.attuned_fluix_construct.name=调谐福鲁伊克斯构造体 +item.contenttweaker.puzzle_solution_attunedfluixconstruct.name=谜题答案：调谐福鲁伊克斯构造体 item.contenttweaker.celestial_lattice.name=天辉晶格 item.contenttweaker.celestial_jewel.name=天辉宝石 item.contenttweaker.lyndenwyrm_warper.name=树龙界跃迁器 @@ -2807,7 +2807,7 @@ item.contenttweaker.shield_of_the_meatball_man.name=肉丸人之盾 item.contenttweaker.true_chaos.name=本真混沌 item.contenttweaker.custom_dimlets.name=自定义维度卡 item.contenttweaker.custom_dimensions.name=自定义维度 -item.contenttweaker.construct_of_will.name=意志之构 +item.contenttweaker.construct_of_will.name=意志构造体 item.contenttweaker.draconic_fabrial.name=龙之法器 item.contenttweaker.celestial_notes.name=天象笔记 item.contenttweaker.etbu_fuel.name=高能TBU燃料 @@ -2875,6 +2875,386 @@ tile.contenttweaker.seal_of_freedom.name=自由之印 tile.contenttweaker.ichorium_void_stone.name=灵液素虚空石 tile.contenttweaker.void_ichorium_rift_cap.name=虚空灵液素裂隙柱顶石 tile.contenttweaker.halite_bejewelled_ichorium_catalyst.name=岩晶嵌宝灵液素催化剂 +fluid.actualizing_fluid=显化流体 +fluid.ultimate_fractallite_essence=终极分形精华 +fluid.actualization_balance=平衡之显化 +fluid.actualization_hope=希望之显化 +fluid.actualization_knowledge=知识之显化 +fluid.actualization_glory=荣耀之显化 +fluid.hyperuranion_binder_oxygen=超越天混合液：氧 +fluid.hyperuranion_binder_hydrogen=超越天混合液：氢 +fluid.hyperuranion_binder_deuterium=超越天混合液：氘 +fluid.hyperuranion_binder_tritium=超越天混合液：氚 +fluid.hyperuranion_binder_iron=超越天混合液：铁 +fluid.hyperuranion_binder_nickel=超越天混合液：镍 +fluid.hyperuranion_binder_lead=超越天混合液：铅 +fluid.hyperuranion_binder_mercury=超越天混合液：汞 +fluid.hyperuranion_binder_tin=超越天混合液：锡 +fluid.high_entropy_hyperdense_plasma=熵变高密度等离子体 +fluid.naquadah_alloy=熔融硅岩合金 +fluid.essence_of_sane_thoughts=理性思维精华 +fluid.recursive_iced_coffee=递归冰咖啡 +fluid.whisper_of_thel=瑟尔之低语 +fluid.whisper_of_ahkrast_korvalain=阿克拉斯特・科瓦莱恩之低语 +fluid.whisper_of_verdith_anath=维狄萨斯・安纳斯之低语 +fluid.whisper_of_omtose_phellack=欧姆托斯・费拉克之低语 +fluid.whisper_of_donaeth_rusen=丹奈斯・鲁森之低语 +fluid.whisper_of_tellan=泰兰之低语 +fluid.whisper_of_kurald_thyrllan=库拉德・泰尔兰之低语 +fluid.whisper_of_kurald_emurlahn=库拉德・暗穆兰之低语 +fluid.whisper_of_kurald_galain=库拉德・加莱之低语 +fluid.whisper_of_starvald_demelain=斯塔沃・德梅兰之低语 +fluid.gluttonous_abyssite=暴食深渊金属 +fluid.arcane_fissile_matter=奥术裂变物质 +fluid.apothecary_fissile_matter=药师裂变物质 +fluid.purified_titanium=熔融纯净钛 +fluid.starmetal_alloy=熔融星辉合金 +fluid.silvan_fissile_matter=繁森裂变物质 +fluid.innerved_fissile_matter=活化裂变物质 +fluid.radiant_fissile_matter=光辉裂变物质 +fluid.pre_baryonic_plasma=前重子等离子体 +fluid.pure_recursion=纯净递归 +fluid.warren_binder_hydrogen=迷道混合液：氢 +fluid.warren_binder_oxygen=迷道混合液：氧 +fluid.warren_binder_deuterium=迷道混合液：氘 +fluid.warren_binder_tritium=迷道混合液：氚 +fluid.warren_binder_helium=迷道混合液：氦 +fluid.warren_binder_iron=迷道混合液：铁 +fluid.warren_binder_nickel=迷道混合液：镍 +fluid.warren_binder_lead=迷道混合液：铅 +fluid.warren_binder_mercury=迷道混合液：汞 +fluid.warren_binder_tin=迷道混合液：锡 +fluid.fractallite_taint=分形腐化 +fluid.hungering_flesh_essence=饥渴血肉精华 +fluid.ascended_fluix_essence=归序飞升精华 +fluid.mastery_of_undeath=亡灵驾驭流体 +fluid.infinite_divine_wish=无尽神圣之愿 +fluid.infinite_insane_wish=无尽疯狂之愿 +fluid.doped_recursion=掺杂递归 +fluid.low_grade_space_time_fuel=低阶时空燃料 +fluid.medium_grade_space_time_fuel=中阶时空燃料 +fluid.high_grade_space_time_fuel=高阶时空燃料 +fluid.starnge_quark_gluon_plasma=奇异夸克胶子等离子体 +fluid.cosmic_ray_particle_mix=宇宙射线粒子混合物 +fluid.trinity_ingot=熔融三一 +fluid.galactic_plasma=银河等离子体 +fluid.cold_plasma=熵惰等离子体 +fluid.black_hole_juice=黑洞汁 +fluid.bewitched_essence_salts=巫师盐精 +item.contenttweaker.astral_insight_10.name=洞悉星辉：10 +item.contenttweaker.astral_insight_20.name=洞悉星辉：20 +item.contenttweaker.astral_insight_30.name=洞悉星辉：30 +item.contenttweaker.astral_insight_40.name=洞悉星辉：40 +item.contenttweaker.astral_insight_50.name=洞悉星辉：50 +item.contenttweaker.astral_insight_60.name=洞悉星辉：60 +item.contenttweaker.astral_insight_70.name=洞悉星辉：70 +item.contenttweaker.astral_insight_80.name=洞悉星辉：80 +item.contenttweaker.astral_insight_90.name=洞悉星辉：90 +item.contenttweaker.astral_insight_100.name=洞悉星辉：100 +item.contenttweaker.spren_summoner_faith.name=灵体召唤物：背信 +item.contenttweaker.spren_summoner_death.name=灵体召唤物：死亡 +item.contenttweaker.spren_summoner_haste.name=灵体召唤物：急迫 +item.contenttweaker.spren_summoner_blasphemy.name=灵体召唤物：亵渎 +item.contenttweaker.spren_summoner_plot.name=灵体召唤物：诡谋 +item.contenttweaker.spren_summoner_injury.name=灵体召唤物：创痕 +item.contenttweaker.spren_summoner_inadequacy.name=灵体召唤物：自轻 +item.contenttweaker.spren_summoner_loneliness.name=灵体召唤物：孤独 +item.contenttweaker.spren_summoner_control.name=灵体召唤物：支配 +item.contenttweaker.spren_summoner_prepotence.name=灵体召唤物：霸权 +item.contenttweaker.spren_summoner_gluttony.name=灵体召唤物：暴食 +item.contenttweaker.spren_summoner_arrogance.name=灵体召唤物：矜狂 +item.contenttweaker.spren_summoner_hope.name=灵体召唤物：希望 +item.contenttweaker.spren_summoner_balance.name=灵体召唤物：平衡 +item.contenttweaker.spren_summoner_glory.name=灵体召唤物：荣耀 +item.contenttweaker.spren_summoner_knowledge.name=灵体召唤物：知识 +item.contenttweaker.oath_of_the_seven_undead_lords.name=七位亡灵之主的誓约 +item.contenttweaker.guardians_of_shadesmar_callstone.name=裂影界守卫召唤石 +item.contenttweaker.trinitas_callstone.name=叁壹界召唤石 +item.contenttweaker.tainted_prison_key.name=腐化监狱钥匙 +item.contenttweaker.mission_of_undeath_callstone.name=亡灵使命召唤石 +item.contenttweaker.gun_devil_confrontation_callstone.name=枪之恶魔召唤石 +item.contenttweaker.universal_constellation_callstone.name=宇宙星座召唤石 +item.contenttweaker.ghost_of_annoyance_callstone.name=恼人幽灵召唤石 +item.contenttweaker.strange_stone_callstone.name=奇异石头召唤石 +item.contenttweaker.lively_tree_callstone.name=生机之树召唤石 +item.contenttweaker.black_hole_juice.name=黑洞汁 +item.contenttweaker.sashimi_of_the_gate_of_darkness.name=黑暗之门生鱼片 +item.contenttweaker.linked_apple_slice.name=关联苹果片 +item.contenttweaker.cleansed_cinnamon_apple.name=洁净肉桂苹果 +item.contenttweaker.tier30_token.name=T30 采掘代币 +item.contenttweaker.infinite_plate_stamp.name=无尽板印模 +item.contenttweaker.infinite_alchemical_plate.name=无尽炼金板 +item.contenttweaker.infinite_recursive_plate.name=无尽递归板 +item.contenttweaker.infinite_entropic_plate.name=无尽熵变板 +item.contenttweaker.cuendillar_plate.name=昆达雅石板 +item.contenttweaker.fractal_stone_dust.name=分形石粉 +item.contenttweaker.freed_sky_stone_dust.name=获释陨石粉 +item.contenttweaker.spatial_compound.name=空间化合物 +item.contenttweaker.puzzle_solution_freedskystone.name=谜题答案：获释陨石 +item.contenttweaker.alchemical_deep_rock.name=炼金深层岩石 +item.contenttweaker.hypercharged_wool.name=超充能羊毛 +item.contenttweaker.hypercharged_redstone.name=超充能红石 +item.contenttweaker.core_of_the_mythic_shells.name=神话叠壳核心 +item.contenttweaker.actualization_of_glory.name=荣耀之显化 +item.contenttweaker.actualization_of_knowledge.name=知识之显化 +item.contenttweaker.actualization_of_balance.name=平衡之显化 +item.contenttweaker.actualization_of_hope.name=希望之显化 +item.contenttweaker.unbound_recursium_fragment.name=未缚递归素碎片 +item.contenttweaker.embodiment_of_glory.name=荣耀之具现 +item.contenttweaker.embodiment_of_balance.name=平衡之具现 +item.contenttweaker.embodiment_of_hope.name=希望之具现 +item.contenttweaker.embodiment_of_knowledge.name=知识之具现 +item.contenttweaker.shard_of_restored_faith.name=信光重曜碎片 +item.contenttweaker.shard_of_forgotten_fear_of_death.name=忧忘生灭碎片 +item.contenttweaker.shard_of_forgiven_lost_time.name=宽怀逝川碎片 +item.contenttweaker.shard_of_rekindled_heritage.name=薪焰重燃碎片 +item.contenttweaker.shard_of_no_hidden_intentions.name=襟怀坦荡碎片 +item.contenttweaker.shard_of_physical_healing.name=身安体泰碎片 +item.contenttweaker.shard_of_realized_worth.name=自明瑾瑜碎片 +item.contenttweaker.shard_of_restored_relationship.name=旧契复温碎片 +item.contenttweaker.shard_of_surrender.name=清静无为碎片 +item.contenttweaker.shard_of_individual_freedom.name=独行自在碎片 +item.contenttweaker.shard_of_controlled_gluttony.name=克饕束欲碎片 +item.contenttweaker.shard_of_humble_education.name=谦逊博识碎片 +item.contenttweaker.living_shard_of_shadesmar.name=裂影界活性碎片 +item.contenttweaker.rune_of_freedom.name=自由符文 +item.contenttweaker.freedomsteel_ingot.name=自由钢锭 +item.contenttweaker.token_of_the_meatball_man.name=肉丸人代币 +item.contenttweaker.finis.name=终结 +item.contenttweaker.recursive_iced_coffee_pot.name=递归冰咖啡壶 +item.contenttweaker.hiddenpowercallstone_loot.name=潜藏之力召唤石战利品 +item.contenttweaker.warren_configurator.name=迷道配置器 +item.contenttweaker.actualized_starlight_sphere.name=显化星辉球 +item.contenttweaker.seeker_stone.name=探求者之石 +item.contenttweaker.reality_pebble.name=真实卵石 +item.contenttweaker.opalescent_matter.name=乳白物质 +item.contenttweaker.unleashed_mithril_1.name=解缚秘银：倾爱者 +item.contenttweaker.unleashed_mithril_2.name=解缚秘银：承爱者 +item.contenttweaker.unleashed_mithril_3.name=解缚秘银：爱 +item.contenttweaker.echo_warren_alloy.name=回响迷道合金锭 +item.contenttweaker.actualized_warren_alloy.name=显化迷道合金锭 +item.contenttweaker.blade_of_the_samurai_queen.name=武士蜜蜂之剑 +item.contenttweaker.alchemical_dust.name=炼金粉 +item.contenttweaker.arcane_fissile_alloy.name=奥术裂变合金 +item.contenttweaker.apothecary_fissile_alloy.name=药师裂变合金 +item.contenttweaker.silvan_fissile_alloy.name=繁森裂变合金 +item.contenttweaker.innerved_fissile_alloy.name=活化裂变合金 +item.contenttweaker.radiant_fissile_alloy.name=光辉裂变合金 +item.contenttweaker.depleted_arcane_fissile_alloy.name=枯竭 +item.contenttweaker.depleted_apothecary_fissile_alloy.name=枯竭药师裂变合金 +item.contenttweaker.depleted_silvan_fissile_alloy.name=枯竭繁森裂变合金 +item.contenttweaker.depleted_innerved_fissile_alloy.name=枯竭活化裂变合金 +item.contenttweaker.depleted_radiant_fissile_alloy.name=枯竭光辉裂变合金 +item.contenttweaker.arcane_fissile_dust.name=奥术裂变粉 +item.contenttweaker.apothecary_fissile_dust.name=药师裂变粉 +item.contenttweaker.silvan_fissile_dust.name=繁森裂变粉 +item.contenttweaker.innerved_fissile_dust.name=活化裂变粉 +item.contenttweaker.radiant_fissile_dust.name=光辉裂变粉 +item.contenttweaker.kampylotitum.name=Kampylotitum Ingot +item.contenttweaker.elleipsinyum.name=Elleipsinyum +item.contenttweaker.ekkremesynium.name=Ekkremesynium +item.contenttweaker.soul_of_kashan.name=卡尚之魂 +item.contenttweaker.pure_twilight_matter.name=纯净暮光物质 +item.contenttweaker.shard_of_the_cosmos.name=寰宇碎片 +item.contenttweaker.true_tongue_oath.name=源语誓约 +item.contenttweaker.trinity_runes.name=三一符文 +item.contenttweaker.runes_of_the_lover.name=倾爱者符文 +item.contenttweaker.runes_of_the_loved.name=承爱者符文 +item.contenttweaker.runes_of_the_love.name=爱之符文 +item.contenttweaker.stone_of_the_lover.name=倾爱者之石 +item.contenttweaker.stone_of_the_loved.name=承爱者之石 +item.contenttweaker.stone_of_the_love.name=爱之石 +item.contenttweaker.call_of_the_lover.name=倾爱者之召唤 +item.contenttweaker.call_of_the_loved.name=承爱者之召唤 +item.contenttweaker.call_of_the_love.name=爱之召唤 +item.contenttweaker.puzzle_solution_cherubim.name=谜题答案：叁壹界智天使 +item.contenttweaker.unleashed_triquetra.name=解缚三弧饰 +item.contenttweaker.cuendillar_catalyst_1.name=昆达雅石催化剂：倾爱者 +item.contenttweaker.cuendillar_catalyst_2.name=昆达雅石催化剂：承爱者 +item.contenttweaker.cuendillar_catalyst_3.name=昆达雅石催化剂：爱 +item.contenttweaker.singular_fractal.name=奇点分形 +item.contenttweaker.infinite_processor.name=无尽处理器 +item.contenttweaker.recursive_quantum.name=递归量子 +item.contenttweaker.fractallite_quantum.name=分形量子 +item.contenttweaker.plate_clump_recursive.name=递归量子碎块 +item.contenttweaker.plate_clump_fractal.name=分形量子碎块 +item.contenttweaker.slightly_dense_pebble.name=稍致密的卵石 +item.contenttweaker.standard_of_the_shyre_empire.name=塞尔瑞帝国之旗 +item.contenttweaker.spooder_glasses.name=四百大玻璃 +item.contenttweaker.massive_boomboom.name=撼世巨爆 +item.contenttweaker.emc_crown.name=EMC王冠 +item.contenttweaker.cosmic_pot.name=寰宇锅 +item.contenttweaker.recursion_of_the_lover.name=倾爱者之递归 +item.contenttweaker.recursion_of_the_loved.name=承爱者之递归 +item.contenttweaker.recursion_of_the_love.name=爱之递归 +item.contenttweaker.atomic_glasses.name=原子玻璃 +item.contenttweaker.cool_walking_stick.name=酷炫手杖 +item.contenttweaker.horrible_unedited_fanfiction.name=未经编辑的可怕同人文 +item.contenttweaker.null_pointer.name=空指针 +item.contenttweaker.p0rtals_redish_white_hat.name=P0rtal的淡红白帽 +item.contenttweaker.collar_bells.name=衣领铃铛 +item.contenttweaker.shield_of_the_arbiter.name=理序主之盾 +item.contenttweaker.trinity_ingot.name=三一锭 +item.contenttweaker.big_bang_matter.name=大爆炸物质 +item.contenttweaker.ascended_gallifreyan_alloy.name=飞升伽里弗雷合金锭 +item.contenttweaker.token_of_forgiveness.name=宽恕代币 +item.contenttweaker.offer_of_restored_balance.name=平衡复归之约 +item.contenttweaker.gem_of_pure_taint.name=纯净腐化宝石 +item.contenttweaker.tainted_claw.name=腐化之爪 +item.contenttweaker.void_chains.name=虚空锁链 +item.contenttweaker.void_ichorium_gem.name=虚空灵液素宝石 +item.contenttweaker.charm_of_the_falling_tower.name=坠星标位护符 +item.contenttweaker.multiblock_input_swapping.name=多方块输入切换 +item.contenttweaker.cursed_dragon_egg.name=诅咒龙蛋 +item.contenttweaker.tainted_alchemic_catalyst.name=腐化炼金催化剂 +item.contenttweaker.recursion_of_taint.name=腐化之递归 +item.contenttweaker.shield_of_the_king_in_Purple.name=紫衣之王之盾 +item.contenttweaker.taint_shield.name=腐化之盾 +item.contenttweaker.taint_gun.name=腐化之枪 +item.contenttweaker.the:ultimate_taint_gun.name=终极腐化之枪 +item.contenttweaker.uncanny_void_cluster.name=怪异虚空簇 +item.contenttweaker.puzzle_solution_undeadsoil.name=谜题答案：亡灵泥土 +item.contenttweaker.respect_of_the_lord_of_lust.name=色欲之主的敬意 +item.contenttweaker.respect_of_the_lord_of_pride.name=傲慢之主的敬意 +item.contenttweaker.respect_of_the_lord_of_envy.name=嫉妒之主的敬意 +item.contenttweaker.respect_of_the_lord_of_greed.name=贪婪之主的敬意 +item.contenttweaker.respect_of_the_lord_of_wrath.name=暴怒之主的敬意 +item.contenttweaker.respect_of_the_lord_of_sloth.name=怠惰之主的敬意 +item.contenttweaker.oath_of_the_lord_of_gluttony.name=暴食之主的誓约 +item.contenttweaker.respect_of_death.name=死亡的敬意 +item.contenttweaker.puzzle_solution_vowtodeath.name=谜题答案：对死亡起誓 +item.contenttweaker.fractallite_taint.name=分形腐化 +item.contenttweaker.recursion_of_gluttony.name=暴食之递归 +item.contenttweaker.wish_of_infinity.name=无尽之愿 +item.contenttweaker.ingot_of_infinite_wishes.name=无尽之愿锭 +item.contenttweaker.gun_devil_limb.name=枪之恶魔肢体 +item.contenttweaker.bullet_of_the_gun_devil.name=枪之恶魔子弹 +item.contenttweaker.magazine_of_the_gun_devil.name=枪之恶魔弹匣 +item.contenttweaker.universal_constellation.name=宇宙星座 +item.contenttweaker.dust_of_infinite_wishes.name=无尽之愿粉 +item.contenttweaker.eleint_stone.name=艾兰特之石 +item.contenttweaker.gem_of_dimensional_ascension.name=维度飞升宝石 +item.contenttweaker.puzzle_solution_dimensionalascension.name=谜题答案：维度飞升 +item.contenttweaker.recursion_of_dimensional_ascension.name=维度飞升之递归 +item.contenttweaker.infinite_tainted_plate.name=无尽腐化板 +item.contenttweaker.fiery_recursion_fragment.name=炽热递归碎片 +item.contenttweaker.everburning_dust.name=永燃粉 +item.contenttweaker.everburning_recursion_fragment.name=永燃递归碎片 +item.contenttweaker.everburning_plating.name=永燃镀层 +item.contenttweaker.quasar_charged_gem.name=类星体充能宝石 +item.contenttweaker.gravitational_time_crystal.name=引力时间晶体 +item.contenttweaker.time_crystal_lattice.name=时间晶格 +item.contenttweaker.warren_plate.name=迷道板 +item.contenttweaker.shield_of_the_king_in_purple.name=紫衣之王之盾 +item.contenttweaker.the_ultimate_taint_gun.name=终极腐化之枪 +item.contenttweaker.power_wrought_brightsteel_alloy_plate.name=能锻星钢合金板 +item.contenttweaker.quasar_charged_dust.name=类星体充能粉 +item.contenttweaker.cleansed_brightsteel_alloy_plate.name=净化星钢合金板 +item.contenttweaker.dimensionally_ascended_garnet.name=维度飞升石榴石 +item.contenttweaker.alchemically_hyperactive_crystal.name=炼金超活性水晶 +item.contenttweaker.dark_matter_scattering_element.name=暗物质散射元件 +item.contenttweaker.fractal_metal_clump.name=分形金属碎块 +item.contenttweaker.fractal_metal_plate.name=分形金属板 +item.contenttweaker.trinity_nugget.name=三一粒 +item.contenttweaker.echo_warren_bar.name=回响迷道条 +item.contenttweaker.galaxy_superconductor.name=银河超导体 +item.contenttweaker.fractallite_focus_lens.name=分形聚焦透镜 +item.contenttweaker.cosmic_string_primer.name=宇宙弦引物 +item.contenttweaker.cosmic_string.name=宇宙弦 +item.contenttweaker.nightmare_of_annoyance.name=恼人噩梦 +item.contenttweaker.strange_stone_essence.name=奇异石头精华 +item.contenttweaker.neutronium_pearl.name=中子素珍珠 +item.contenttweaker.mixed_metal_shard.name=混合金属碎片 +item.contenttweaker.black_hole_alloy_clump.name=黑洞合金碎块 +item.contenttweaker.softened_black_hole_alloy_clump.name=退火黑洞合金碎块 +item.contenttweaker.drawn_black_hole_alloy_clump.name=浸没黑洞合金碎块 +item.contenttweaker.quenched_black_hole_alloy_clump.name=淬火黑洞合金碎块 +item.contenttweaker.black_hole_alloy_ingot.name=黑洞合金锭 +item.contenttweaker.galactic_core.name=银河核心 +item.contenttweaker.galactic_power_unit.name=银河能量单元 +item.contenttweaker.cosmic_string_conduit.name=宇宙弦导管 +item.contenttweaker.eye_of_harmony_power_unit.name=鸿蒙之眼能量单元 +item.contenttweaker.defined_bar.name=定义条 +item.contenttweaker.salt_of_knowledge.name=知识之盐 +item.contenttweaker.clearing_taint.name=清除腐化 +item.contenttweaker.lost_cities_worldgen.name=发现于失落的城市 +item.contenttweaker.experience_configurator.name=经验配置器 +item.contenttweaker.stone_of_dimensional_ascension.name=维度飞升之石 +item.contenttweaker.astral_mastery_tome.name=星辉真解 +item.contenttweaker.master_spell_infernum.name=主宰法咒：Infernum +item.contenttweaker.master_spell_sonus.name=主宰法咒：Sonus +item.contenttweaker.master_spell_gognitio.name=主宰法咒：Cognitio +item.contenttweaker.white_hole_core.name=白洞核心 +item.contenttweaker.quasar_core.name=类星体核心 +item.contenttweaker.call_to_mission.name=使命召唤 +item.contenttweaker.summons_of_the_realmshifter_cherubim.name=维境跃迁者智天使召唤物 +item.contenttweaker.prayer_to_the_trinity_of_love.name=爱之三一祷言 +item.contenttweaker.key_of_restored_balance.name=平衡复归之钥 +item.contenttweaker.void_ichorium_jewel.name=虚空灵液素珠宝 +item.contenttweaker.void_ichorium_rift.name=虚空灵液素裂隙 +item.contenttweaker.summons_to_the_meatball_man.name=肉丸人召唤物 +item.contenttweaker.vow_to_death.name=对死亡起誓 +tile.contenttweaker.ascended_spatial_chassis.name=飞升空间框架 +tile.contenttweaker.actualizing_casing.name=显化外壳 +tile.contenttweaker.hyperuranion_actualized_naquadah.name=超越天显化器：硅岩 +tile.contenttweaker.hyperuranion_actualized_dragonsteel.name=超越天显化器：龙钢 +tile.contenttweaker.hyperuranion_actualized_dimshard.name=超越天显化器：维度碎片 +tile.contenttweaker.hyperuranion_actualized_rhenia.name=超越天显化器：铼 +tile.contenttweaker.recursive_brain.name=递归之脑 +tile.contenttweaker.recursive_brain_plug.name=递归之脑塞子 +tile.contenttweaker.hyperuranion_conduit.name=超越天导管 +tile.contenttweaker.hyperuranion_casing.name=超越天外壳 +tile.contenttweaker.horizon_sustainer.name=地平线维持器 +tile.contenttweaker.dyson_extruder.name=戴森冲流器 +tile.contenttweaker.exotic_absorber.name=异域吸收器 +tile.contenttweaker.exotic_dyson_conduit.name=异域戴森导管 +tile.contenttweaker.mortum_livingrock.name=死域活石 +tile.contenttweaker.mortum_livingwood.name=死域活木 +tile.contenttweaker.focused_plasma_collider.name=聚焦等离子体对撞机 +tile.contenttweaker.superfocused_plasma_collider.name=超聚焦等离子体对撞机 +tile.contenttweaker.hyperfocused_plasma_collider.name=超限聚焦等离子体对撞机 +tile.contenttweaker.stormlight_stone.name=飓光之石 +tile.contenttweaker.stone_of_shadesmar.name=裂影界之石 +tile.contenttweaker.catalyst_of_the_warrens.name=迷道催化器 +tile.contenttweaker.absolutely_autentic_rainbowgen.name=彩虹发电机（绝对真品） +tile.contenttweaker.balanced_machine_casing.name=平衡机械外壳 +tile.contenttweaker.gallifreyan_neutronium_casing.name=伽里弗雷中子素外壳 +tile.contenttweaker.quark_neutronium_module.name=夸克中子素模块 +tile.contenttweaker.hyperuranium_actualizer_ichor.name=超越天显化器：灵液 +tile.contenttweaker.undead_soil.name=亡灵泥土 +tile.contenttweaker.fractallite_halite_stone.name=分形岩晶石 +tile.contenttweaker.catalyst_of_balance.name=平衡催化器 +tile.contenttweaker.space_time_beam.name=时空束梁 +tile.contenttweaker.quasar_stabilizer.name=类星体稳定器 +tile.contenttweaker.quasar_screen.name=类星体屏幕 +tile.contenttweaker.galaxy_conduit.name=银河导管 +tile.contenttweaker.echo_warren_stone.name=回响迷道之石 +tile.contenttweaker.galaxy_accelerator.name=银河加速器 +tile.contenttweaker.miniature_quasar.name=微型类星体 +tile.contenttweaker.ascended_fluix_etcher.name=飞升福鲁伊克斯蚀刻器 +tile.contenttweaker.naquadah_casing.name=硅岩外壳 +tile.contenttweaker.dark_matter_node.name=暗物质节点 +tile.contenttweaker.cosmic_balance_coil.name=寰宇平衡线圈 +tile.contenttweaker.toroid_galaxy_tube.name=环状银河管道 +tile.contenttweaker.stone_of_worthiness.name=价值之石 +tile.contenttweaker.recurring_nightmare_block.name=轮回噩梦方块 +tile.contenttweaker.trinity_neutronium_casing.name=三一中子素外壳 +tile.contenttweaker.quark_cosmic_module.name=宇宙弦模块 +tile.contenttweaker.tardis_casing.name=塔迪斯外壳 +tile.contenttweaker.tardis_stem.name=塔迪斯茎秆 +tile.contenttweaker.tardis_branch.name=塔迪斯枝杈 +tile.contenttweaker.tardis_polyp.name=塔迪斯珊瑚虫 +tile.contenttweaker.nineteen_blocks.name=19个方块 +tile.contenttweaker.wormhole_field_module.name=虫洞场模块 +tile.contenttweaker.fabric_of_the_orb.name=结构宝珠 +tile.contenttweaker.miniature_white_hole.name=微型白洞 +item.contenttweaker.supercharged_signalum.name=超充能信素锭 +item.contenttweaker.charged_signalum.name=充能信素锭 +tile.contenttweaker.hyperuranion_actualizer_naquadah.name=超越天显化器：硅岩 +tile.contenttweaker.hyperuranion_actualizer_dragonsteel.name=超越天显化器：龙钢 +tile.contenttweaker.hyperuranion_actualizer_dimshard.name=超越天显化器：维度碎片 +tile.contenttweaker.hyperuranion_actualizer_rhenia.name=超越天显化器：铼 + # Custom Materials base.material.demonic_steel=恶魔钢 base.material.corrosive_steel=腐蚀钢 diff --git a/oresources/modularmachinery/lang/zh_cn.lang b/oresources/modularmachinery/lang/zh_cn.lang index 2c1d3416..6b9c9d1e 100644 --- a/oresources/modularmachinery/lang/zh_cn.lang +++ b/oresources/modularmachinery/lang/zh_cn.lang @@ -210,7 +210,7 @@ modularmachinery.recursive_brain_in_a_vat_omtose_phellack=缸中探求者之脑 modularmachinery.recursive_brain_in_a_vat_starvald_demelain=缸中探求者之脑，斯塔沃・德梅兰的探索者 modularmachinery.recursive_brain_in_a_vat_tellan=缸中探求者之脑，泰兰的探索者 modularmachinery.recursive_brain_in_a_vat_thel=缸中探求者之脑，瑟尔的探索者 -modularmachinery.recursive_brain_in_a_vat_verdith_anath=缸中探求者之脑，维狄萨纳斯的探索者 +modularmachinery.recursive_brain_in_a_vat_verdith_anath=缸中探求者之脑，维狄萨斯・安纳斯的探索者 modularmachinery.recursive_brain_in_a_vat=递归缸中之脑 modularmachinery.mythical_resource_miner_tier30=卡尚神话虚空资源采掘机 modularmachinery.warren_extractor_actualizing_stone=迷道提取器：显化之石 @@ -218,4 +218,7 @@ modularmachinery.warren_extractor_dimensional_shards=迷道提取器：维度碎 modularmachinery.warren_extractor_dragonsteel=迷道提取器：龙钢 modularmachinery.warren_extractor_ichor=迷道提取器：灵液 modularmachinery.warren_extractor_naquadah=迷道提取器：硅岩 -modularmachinery.warren_extractor_rhenia=迷道提取器：铼 \ No newline at end of file +modularmachinery.warren_extractor_rhenia=迷道提取器：铼 +modularmachinery.bastion_of_flesh=蜜蜂星门 +modularmachinery.wormhole_field_generator=虫洞场发生器 +modularmachinery.xp_assimilator=经验浴池 \ No newline at end of file diff --git a/pillar/bee_treeoflife_callstone.json b/pillar/bee_treeoflife_callstone.json new file mode 100644 index 00000000..d5171156 --- /dev/null +++ b/pillar/bee_treeoflife_callstone.json @@ -0,0 +1,30 @@ +// =================================================================== +// This is a template for a Pillar structure +// Do not include these lines in your file +// The _template.json file is ignored so don't worry about it +// =================================================================== + +{ + "generatorType": "NONE", + "minY": -1, + "maxY": -1, + "offsetX": 0, + "offsetY": 0, + "offsetZ": 0, + "mirrorType": "NONE", + "rotation": null, + "ignoreEntities": false, + "dimensionSpawns": [], + "biomeNameSpawns": [], + "biomeTagSpawns": [], + "isDimensionSpawnsBlacklist": false, + "isBiomeNameSpawnsBlacklist": false, + "isBiomeTagSpawnsBlacklist": false, + "generateEverywhere": false, + "integrity": 1, + "decay": 0, + "filling": "", + "fillingMetadata": 0, + "fillingType": "AIR", + "rarity": 100 +} \ No newline at end of file diff --git a/pillar/nether_villager_house_6.json b/pillar/nether_villager_house_6.json new file mode 100644 index 00000000..23d5bf92 --- /dev/null +++ b/pillar/nether_villager_house_6.json @@ -0,0 +1,30 @@ + +{ + "generatorType": "ANYWHERE", + "minY": 129, + "maxY": 140, + "offsetX": 0, + "offsetY": 0, + "offsetZ": 0, + + "mirrorType": "NONE", + "rotation": null, + "ignoreEntities": false, + + "dimensionSpawns": [-1], + "biomeNameSpawns": [], + "biomeTagSpawns": [], + "isDimensionSpawnsBlacklist": false, + "isBiomeNameSpawnsBlacklist": true, + "isBiomeTagSpawnsBlacklist": true, + "generateEverywhere": false, + + "integrity": 1, + "decay": 0, + + "filling": "minecraft:netherrack", + "fillingMetadata": 0, + "fillingType": "AIR", + + "rarity": 300 +} \ No newline at end of file diff --git a/pillar/structures/bee_treeoflife_callstone.nbt b/pillar/structures/bee_treeoflife_callstone.nbt new file mode 100644 index 00000000..83b8306d Binary files /dev/null and b/pillar/structures/bee_treeoflife_callstone.nbt differ diff --git a/pillar/structures/nether_villager_house_6.nbt b/pillar/structures/nether_villager_house_6.nbt new file mode 100644 index 00000000..4e2f8d05 Binary files /dev/null and b/pillar/structures/nether_villager_house_6.nbt differ diff --git a/resources/avaritiaitem/lang/en_us.lang b/resources/avaritiaitem/lang/en_us.lang index 7143a6c1..350336b2 100644 --- a/resources/avaritiaitem/lang/en_us.lang +++ b/resources/avaritiaitem/lang/en_us.lang @@ -2,6 +2,11 @@ item.avaritiaitem.fractallite_halite_catalyst.name=Fractallite Halite Catalyst item.avaritiaitem.meatball_man_destruction_fabrial.name=Meatball Man destruction fabrial item.avaritiaitem.self_actualizing_stone.name=Self Actualizing Stone item.avaritiaitem.spatial_processor.name=Ascended Spatial Processor - +item.avaritiaitem.cosmic_balance.name=Cosmic Balance +item.avaritiaitem.bedrock_blaster.name=Bedrock Blaster +item.avaritiaitem.cosmic_fractal_catalyzer.name=Cosmic Fractal Catalyzer +item.avaritiaitem.cosmic_fractal_harmonizer.name=Cosmic Fractal Harmonizer +item.avaritiaitem.cosmic_halite_cluster.name=Cosmic Halite Cluster +item.avaritiaitem.univocal_halite_cluster.name=Univocal Halite Cluster diff --git a/resources/avaritiaitem/textures/items/bedrock_blaster.png b/resources/avaritiaitem/textures/items/bedrock_blaster.png new file mode 100644 index 00000000..bd7a1ce4 Binary files /dev/null and b/resources/avaritiaitem/textures/items/bedrock_blaster.png differ diff --git a/resources/avaritiaitem/textures/items/bedrock_blaster_mask.png b/resources/avaritiaitem/textures/items/bedrock_blaster_mask.png new file mode 100644 index 00000000..abf87fae Binary files /dev/null and b/resources/avaritiaitem/textures/items/bedrock_blaster_mask.png differ diff --git a/resources/avaritiaitem/textures/items/cosmic_balance.png b/resources/avaritiaitem/textures/items/cosmic_balance.png new file mode 100644 index 00000000..c2c7f193 Binary files /dev/null and b/resources/avaritiaitem/textures/items/cosmic_balance.png differ diff --git a/resources/avaritiaitem/textures/items/cosmic_balance_mask.png b/resources/avaritiaitem/textures/items/cosmic_balance_mask.png new file mode 100644 index 00000000..29a39f9d Binary files /dev/null and b/resources/avaritiaitem/textures/items/cosmic_balance_mask.png differ diff --git a/resources/avaritiaitem/textures/items/cosmic_fractal_catalyzer.png b/resources/avaritiaitem/textures/items/cosmic_fractal_catalyzer.png new file mode 100644 index 00000000..d84f1e8a Binary files /dev/null and b/resources/avaritiaitem/textures/items/cosmic_fractal_catalyzer.png differ diff --git a/resources/avaritiaitem/textures/items/cosmic_fractal_catalyzer_mask.png b/resources/avaritiaitem/textures/items/cosmic_fractal_catalyzer_mask.png new file mode 100644 index 00000000..096fff07 Binary files /dev/null and b/resources/avaritiaitem/textures/items/cosmic_fractal_catalyzer_mask.png differ diff --git a/resources/avaritiaitem/textures/items/cosmic_fractal_harmonizer.png b/resources/avaritiaitem/textures/items/cosmic_fractal_harmonizer.png new file mode 100644 index 00000000..cd1c4f1f Binary files /dev/null and b/resources/avaritiaitem/textures/items/cosmic_fractal_harmonizer.png differ diff --git a/resources/avaritiaitem/textures/items/cosmic_fractal_harmonizer_mask.png b/resources/avaritiaitem/textures/items/cosmic_fractal_harmonizer_mask.png new file mode 100644 index 00000000..44cc16a5 Binary files /dev/null and b/resources/avaritiaitem/textures/items/cosmic_fractal_harmonizer_mask.png differ diff --git a/resources/avaritiaitem/textures/items/cosmic_halite_cluster.png b/resources/avaritiaitem/textures/items/cosmic_halite_cluster.png new file mode 100644 index 00000000..3a4ba568 Binary files /dev/null and b/resources/avaritiaitem/textures/items/cosmic_halite_cluster.png differ diff --git a/resources/avaritiaitem/textures/items/cosmic_halite_cluster_mask.png b/resources/avaritiaitem/textures/items/cosmic_halite_cluster_mask.png new file mode 100644 index 00000000..a952d067 Binary files /dev/null and b/resources/avaritiaitem/textures/items/cosmic_halite_cluster_mask.png differ diff --git a/resources/avaritiaitem/textures/items/depleted_radiant_fissile_alloy.png b/resources/avaritiaitem/textures/items/depleted_radiant_fissile_alloy.png new file mode 100644 index 00000000..5248e41e Binary files /dev/null and b/resources/avaritiaitem/textures/items/depleted_radiant_fissile_alloy.png differ diff --git a/resources/avaritiaitem/textures/items/univocal_halite_cluster.png b/resources/avaritiaitem/textures/items/univocal_halite_cluster.png new file mode 100644 index 00000000..01d48685 Binary files /dev/null and b/resources/avaritiaitem/textures/items/univocal_halite_cluster.png differ diff --git a/resources/avaritiaitem/textures/items/univocal_halite_cluster_mask.png b/resources/avaritiaitem/textures/items/univocal_halite_cluster_mask.png new file mode 100644 index 00000000..4a4c8357 Binary files /dev/null and b/resources/avaritiaitem/textures/items/univocal_halite_cluster_mask.png differ diff --git a/resources/contenttweaker/blockstates/akathartos_portal_block.json b/resources/contenttweaker/blockstates/akathartos_portal_block.json new file mode 100644 index 00000000..2094e9b1 --- /dev/null +++ b/resources/contenttweaker/blockstates/akathartos_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/akathartos_portal_block", + "particle": "contenttweaker:blocks/akathartos_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/alkemia_portal_block.json b/resources/contenttweaker/blockstates/alkemia_portal_block.json new file mode 100644 index 00000000..ddcf1f70 --- /dev/null +++ b/resources/contenttweaker/blockstates/alkemia_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/alkemia_portal_block", + "particle": "contenttweaker:blocks/alkemia_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/apichisi_portal_block.json b/resources/contenttweaker/blockstates/apichisi_portal_block.json new file mode 100644 index 00000000..864d5873 --- /dev/null +++ b/resources/contenttweaker/blockstates/apichisi_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/apichisi_portal_block", + "particle": "contenttweaker:blocks/apichisi_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/bewitched_essence_salts.json b/resources/contenttweaker/blockstates/bewitched_essence_salts.json new file mode 100644 index 00000000..65f2918b --- /dev/null +++ b/resources/contenttweaker/blockstates/bewitched_essence_salts.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "forge:fluid", + "custom": { + "fluid": "bewitched_essence_salts" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/diamerisma_portal_block.json b/resources/contenttweaker/blockstates/diamerisma_portal_block.json new file mode 100644 index 00000000..640a0317 --- /dev/null +++ b/resources/contenttweaker/blockstates/diamerisma_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/diamerisma_portal_block", + "particle": "contenttweaker:blocks/diamerisma_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/europa_portal_block.json b/resources/contenttweaker/blockstates/europa_portal_block.json new file mode 100644 index 00000000..04b61a34 --- /dev/null +++ b/resources/contenttweaker/blockstates/europa_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/europa_portal_block", + "particle": "contenttweaker:blocks/europa_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/fabric_of_the_orb.json b/resources/contenttweaker/blockstates/fabric_of_the_orb.json new file mode 100644 index 00000000..8a051a6b --- /dev/null +++ b/resources/contenttweaker/blockstates/fabric_of_the_orb.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/fabric_of_the_orb", + "particle": "contenttweaker:blocks/fabric_of_the_orb" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/falacer_portal_block.json b/resources/contenttweaker/blockstates/falacer_portal_block.json new file mode 100644 index 00000000..92afbba2 --- /dev/null +++ b/resources/contenttweaker/blockstates/falacer_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/falacer_portal_block", + "particle": "contenttweaker:blocks/falacer_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/finem_portal_block.json b/resources/contenttweaker/blockstates/finem_portal_block.json new file mode 100644 index 00000000..f1eb9763 --- /dev/null +++ b/resources/contenttweaker/blockstates/finem_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/finem_portal_block", + "particle": "contenttweaker:blocks/finem_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/furatto_portal_block.json b/resources/contenttweaker/blockstates/furatto_portal_block.json new file mode 100644 index 00000000..081b4cd2 --- /dev/null +++ b/resources/contenttweaker/blockstates/furatto_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/furatto_portal_block", + "particle": "contenttweaker:blocks/furatto_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/gallifrey_portal_block.json b/resources/contenttweaker/blockstates/gallifrey_portal_block.json new file mode 100644 index 00000000..4a8a2101 --- /dev/null +++ b/resources/contenttweaker/blockstates/gallifrey_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/gallifrey_portal_block", + "particle": "contenttweaker:blocks/gallifrey_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/hator_portal_block.json b/resources/contenttweaker/blockstates/hator_portal_block.json new file mode 100644 index 00000000..d1bc555b --- /dev/null +++ b/resources/contenttweaker/blockstates/hator_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/hator_portal_block", + "particle": "contenttweaker:blocks/hator_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/haumea_portal_block.json b/resources/contenttweaker/blockstates/haumea_portal_block.json new file mode 100644 index 00000000..d4f23e73 --- /dev/null +++ b/resources/contenttweaker/blockstates/haumea_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/haumea_portal_block", + "particle": "contenttweaker:blocks/haumea_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/luna_portal_block.json b/resources/contenttweaker/blockstates/luna_portal_block.json new file mode 100644 index 00000000..21996a7e --- /dev/null +++ b/resources/contenttweaker/blockstates/luna_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/luna_portal_block", + "particle": "contenttweaker:blocks/luna_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/lyndenwyrm_portal_block.json b/resources/contenttweaker/blockstates/lyndenwyrm_portal_block.json new file mode 100644 index 00000000..cd290e79 --- /dev/null +++ b/resources/contenttweaker/blockstates/lyndenwyrm_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/lyndenwyrm_portal_block", + "particle": "contenttweaker:blocks/lyndenwyrm_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/myrmex_portal_block.json b/resources/contenttweaker/blockstates/myrmex_portal_block.json new file mode 100644 index 00000000..d020ad3c --- /dev/null +++ b/resources/contenttweaker/blockstates/myrmex_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/myrmex_portal_block", + "particle": "contenttweaker:blocks/myrmex_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/nero_portal_block.json b/resources/contenttweaker/blockstates/nero_portal_block.json new file mode 100644 index 00000000..62c6e3b2 --- /dev/null +++ b/resources/contenttweaker/blockstates/nero_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/nero_portal_block", + "particle": "contenttweaker:blocks/nero_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/oi_portal_block.json b/resources/contenttweaker/blockstates/oi_portal_block.json new file mode 100644 index 00000000..7f4fe108 --- /dev/null +++ b/resources/contenttweaker/blockstates/oi_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/oi_portal_block", + "particle": "contenttweaker:blocks/oi_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/orcus_portal_block.json b/resources/contenttweaker/blockstates/orcus_portal_block.json new file mode 100644 index 00000000..65845424 --- /dev/null +++ b/resources/contenttweaker/blockstates/orcus_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/orcus_portal_block", + "particle": "contenttweaker:blocks/orcus_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/osiris_portal_block.json b/resources/contenttweaker/blockstates/osiris_portal_block.json new file mode 100644 index 00000000..2964d44b --- /dev/null +++ b/resources/contenttweaker/blockstates/osiris_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/osiris_portal_block", + "particle": "contenttweaker:blocks/osiris_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/pauram_portal_block.json b/resources/contenttweaker/blockstates/pauram_portal_block.json new file mode 100644 index 00000000..9824ca8b --- /dev/null +++ b/resources/contenttweaker/blockstates/pauram_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/pauram_portal_block", + "particle": "contenttweaker:blocks/pauram_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/pixonia_portal_block.json b/resources/contenttweaker/blockstates/pixonia_portal_block.json new file mode 100644 index 00000000..23d1436a --- /dev/null +++ b/resources/contenttweaker/blockstates/pixonia_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/pixonia_portal_block", + "particle": "contenttweaker:blocks/pixonia_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/proxima_portal_block.json b/resources/contenttweaker/blockstates/proxima_portal_block.json new file mode 100644 index 00000000..7371208d --- /dev/null +++ b/resources/contenttweaker/blockstates/proxima_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/proxima_portal_block", + "particle": "contenttweaker:blocks/proxima_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/ptah_portal_block.json b/resources/contenttweaker/blockstates/ptah_portal_block.json new file mode 100644 index 00000000..2f534dda --- /dev/null +++ b/resources/contenttweaker/blockstates/ptah_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/ptah_portal_block", + "particle": "contenttweaker:blocks/ptah_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/rhenia_portal_block.json b/resources/contenttweaker/blockstates/rhenia_portal_block.json new file mode 100644 index 00000000..1dc983e3 --- /dev/null +++ b/resources/contenttweaker/blockstates/rhenia_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/rhenia_portal_block", + "particle": "contenttweaker:blocks/rhenia_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/sedna_portal_block.json b/resources/contenttweaker/blockstates/sedna_portal_block.json new file mode 100644 index 00000000..e5d3aa85 --- /dev/null +++ b/resources/contenttweaker/blockstates/sedna_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/sedna_portal_block", + "particle": "contenttweaker:blocks/sedna_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/taerrapiatta_portal_block.json b/resources/contenttweaker/blockstates/taerrapiatta_portal_block.json new file mode 100644 index 00000000..d8f2e324 --- /dev/null +++ b/resources/contenttweaker/blockstates/taerrapiatta_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/taerrapiatta_portal_block", + "particle": "contenttweaker:blocks/taerrapiatta_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/wormhole_field_module.json b/resources/contenttweaker/blockstates/wormhole_field_module.json new file mode 100644 index 00000000..6f6a42ab --- /dev/null +++ b/resources/contenttweaker/blockstates/wormhole_field_module.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/wormhole_field_module", + "particle": "contenttweaker:blocks/wormhole_field_module" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/zoi_portal_block.json b/resources/contenttweaker/blockstates/zoi_portal_block.json new file mode 100644 index 00000000..8f595986 --- /dev/null +++ b/resources/contenttweaker/blockstates/zoi_portal_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/zoi_portal_block", + "particle": "contenttweaker:blocks/zoi_portal_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/lang/en_us.lang b/resources/contenttweaker/lang/en_us.lang index d321d9c8..62e3ffb6 100644 --- a/resources/contenttweaker/lang/en_us.lang +++ b/resources/contenttweaker/lang/en_us.lang @@ -1473,7 +1473,7 @@ item.contenttweaker.dynatos_star.name=Dynatos Star item.contenttweaker.greed_stone.name=Greed Stone item.contenttweaker.gun_devil_chunk.name=Gun Devil Chunk item.contenttweaker.pharos_callstone.name=Pharos Callstone -item.contenttweaker.gun_devil_callstone.name=Gun Devil Callstone +item.contenttweaker.gun_devil_callstone.name=Worshippers of the Gun Devil Callstone item.contenttweaker.envy_stone.name=Envy Stone item.contenttweaker.upper_fragment_cosmos.name=Upper Fragment of the Cosmos item.contenttweaker.constructor_summoner.name=Dungeon Constructor Summoner @@ -2875,6 +2875,381 @@ tile.contenttweaker.seal_of_freedom.name=Seal of Freedom tile.contenttweaker.ichorium_void_stone.name=Ichorium Void Stone tile.contenttweaker.void_ichorium_rift_cap.name=Void Ichorium Rift Cap tile.contenttweaker.halite_bejewelled_ichorium_catalyst.name=Halite Bejewelled Ichorium Catalyst +fluid.actualizing_fluid=Actualizing Fluid +fluid.ultimate_fractallite_essence=Ultimate Fractallite Essence +fluid.actualization_balance=Actualization of Balance +fluid.actualization_hope=Actualization of Hope +fluid.actualization_knowledge=Actualization of Knowledge +fluid.actualization_glory=Actualization of Glory +fluid.hyperuranion_binder_oxygen=Hyperuarnion Binder: Oxygen +fluid.hyperuranion_binder_hydrogen=Hyperuarnion Binder: Hydrogen +fluid.hyperuranion_binder_deuterium=Hyperuarnion Binder: Deuterium +fluid.hyperuranion_binder_tritium=Hyperuarnion Binder: Tritium +fluid.hyperuranion_binder_iron=Hyperuarnion Binder: Iron +fluid.hyperuranion_binder_nickel=Hyperuarnion Binder: Nickel +fluid.hyperuranion_binder_lead=Hyperuarnion Binder: Lead +fluid.hyperuranion_binder_mercury=Hyperuarnion Binder: Mercury +fluid.hyperuranion_binder_tin=Hyperuarnion Binder: Tin +fluid.high_entropy_hyperdense_plasma=Entropic Hyperdense Plasma +fluid.naquadah_alloy=Molten Naquadah Alloy +fluid.essence_of_sane_thoughts=Essence of Sane Thoughts +fluid.recursive_iced_coffee=Recursive Iced Coffee +fluid.whisper_of_thel=Whisper of Thel +fluid.whisper_of_ahkrast_korvalain=Whisper of Ahkrast Korvalain +fluid.whisper_of_verdith_anath=Whisper of Verdith Anath +fluid.whisper_of_omtose_phellack=Whisper of Omtose Phellack +fluid.whisper_of_donaeth_rusen=Whisper of Donaeth Rusen +fluid.whisper_of_tellan=Whisper of Tellan +fluid.whisper_of_kurald_thyrllan=Whisper of Kurald Thyrllan +fluid.whisper_of_kurald_emurlahn=Whisper of Kurald Emurlahn +fluid.whisper_of_kurald_galain=Whisper of Kurald Galain +fluid.whisper_of_starvald_demelain=Whisper of Starvald Demelain +fluid.gluttonous_abyssite=Gluttonous Abyssite +fluid.arcane_fissile_matter=Arcane Fissile Matter +fluid.apothecary_fissile_matter=Apothecary Fissile Matter +fluid.purified_titanium=Molten Purified Titanium +fluid.starmetal_alloy=Molten Starmetal Alloy +fluid.silvan_fissile_matter=Silvan Fissile Matter +fluid.innerved_fissile_matter=Innerved Fissile Matter +fluid.radiant_fissile_matter=Radiant Fissile Matter +fluid.pre_baryonic_plasma=Pre-Baryonic Plasma +fluid.pure_recursion=Pure Recursion +fluid.warren_binder_hydrogen=Warren Binder: Hydrogen +fluid.warren_binder_oxygen=Warren Binder: Oxygen +fluid.warren_binder_deuterium=Warren Binder: Deuterium +fluid.warren_binder_tritium=Warren Binder: Tritium +fluid.warren_binder_helium=Warren Binder: Helium +fluid.warren_binder_iron=Warren Binder: Iron +fluid.warren_binder_nickel=Warren Binder: Nickel +fluid.warren_binder_lead=Warren Binder: Lead +fluid.warren_binder_mercury=Warren Binder: Mercury +fluid.warren_binder_tin=Warren Binder: Tin +fluid.fractallite_taint=Fractallite Taint +fluid.hungering_flesh_essence=Essence of the Hungering Flesh +fluid.ascended_fluix_essence=Essence of the Ordering Ascension +fluid.mastery_of_undeath=Masterful Undeath Fluid +fluid.infinite_divine_wish=Infinite Divine Wish +fluid.infinite_insane_wish=Infinite Insane Wish +fluid.doped_recursion=Doped Recursion +fluid.low_grade_space_time_fuel=Low-Grade Space-Time Fuel +fluid.medium_grade_space_time_fuel=Medium-Grade Space-Time Fuel +fluid.high_grade_space_time_fuel=High-Grade Space-Time Fuel +fluid.starnge_quark_gluon_plasma=Strange Quark Gluon Plasma +fluid.cosmic_ray_particle_mix=Cosmic Ray Particle Mix +fluid.trinity_ingot=Molten Trinity +fluid.galactic_plasma=Galactic Plasma +fluid.cold_plasma=Entropically-Inert Plasma +fluid.black_hole_juice=Black Hole Juice +fluid.bewitched_essence_salts=Bewitched Essence Salts +item.contenttweaker.astral_insight_10.name=Astral Insight: 10 +item.contenttweaker.astral_insight_20.name=Astral Insight: 20 +item.contenttweaker.astral_insight_30.name=Astral Insight: 30 +item.contenttweaker.astral_insight_40.name=Astral Insight: 40 +item.contenttweaker.astral_insight_50.name=Astral Insight: 50 +item.contenttweaker.astral_insight_60.name=Astral Insight: 60 +item.contenttweaker.astral_insight_70.name=Astral Insight: 70 +item.contenttweaker.astral_insight_80.name=Astral Insight: 80 +item.contenttweaker.astral_insight_90.name=Astral Insight: 90 +item.contenttweaker.astral_insight_100.name=Astral Insight: 100 +item.contenttweaker.spren_summoner_faith.name=Spren Summoner: Disbelief +item.contenttweaker.spren_summoner_death.name=Spren Summoner: Death +item.contenttweaker.spren_summoner_haste.name=Spren Summoner: Haste +item.contenttweaker.spren_summoner_blasphemy.name=Spren Summoner: Blasphemy +item.contenttweaker.spren_summoner_plot.name=Spren Summoner: Plotting +item.contenttweaker.spren_summoner_injury.name=Spren Summoner: Injury +item.contenttweaker.spren_summoner_inadequacy.name=Spren Summoner: Inadequacy +item.contenttweaker.spren_summoner_loneliness.name=Spren Summoner: Loneliness +item.contenttweaker.spren_summoner_control.name=Spren Summoner: Control +item.contenttweaker.spren_summoner_prepotence.name=Spren Summoner: Prepotence +item.contenttweaker.spren_summoner_gluttony.name=Spren Summoner: Gluttony +item.contenttweaker.spren_summoner_arrogance.name=Spren Summoner: Arrogance +item.contenttweaker.spren_summoner_hope.name=Spren Summoner: Hope +item.contenttweaker.spren_summoner_balance.name=Spren Summoner: Balance +item.contenttweaker.spren_summoner_glory.name=Spren Summoner: Glory +item.contenttweaker.spren_summoner_knowledge.name=Spren Summoner: Knowledge +item.contenttweaker.oath_of_the_seven_undead_lords.name=Oath of the Seven Undead Lords +item.contenttweaker.guardians_of_shadesmar_callstone.name=Guardians of Shadesmar Callstone +item.contenttweaker.trinitas_callstone.name=Trinitas Callstone +item.contenttweaker.tainted_prison_key.name=Tainted Prison key +item.contenttweaker.mission_of_undeath_callstone.name=Mission of Undeath Callstone +item.contenttweaker.gun_devil_confrontation_callstone.name=Gun Devil Callstone +item.contenttweaker.universal_constellation_callstone.name=Universal Constellation Callstone +item.contenttweaker.ghost_of_annoyance_callstone.name=Ghost of Annoyance Callstone +item.contenttweaker.strange_stone_callstone.name=Strange Stone Callstone +item.contenttweaker.lively_tree_callstone.name=Lively Tree Callstone +item.contenttweaker.black_hole_juice.name=Black Hole Juice +item.contenttweaker.sashimi_of_the_gate_of_darkness.name=Sashimi of the Gate of Darkness +item.contenttweaker.linked_apple_slice.name=Linked Apple Slice +item.contenttweaker.cleansed_cinnamon_apple.name=Cleansed Cinnamon Apple +item.contenttweaker.tier30_token.name=Tier 30 Excavation Token +item.contenttweaker.infinite_plate_stamp.name=Infinite Plate Stamp +item.contenttweaker.infinite_alchemical_plate.name=Infinite Alchemical Plate +item.contenttweaker.infinite_recursive_plate.name=Infinite Recursive Plate +item.contenttweaker.infinite_entropic_plate.name=Infinite Entropic Plate +item.contenttweaker.cuendillar_plate.name=Cuendillar Plate +item.contenttweaker.fractal_stone_dust.name=Fractal Stone Dust +item.contenttweaker.freed_sky_stone_dust.name=Freed Sky Stone Dust +item.contenttweaker.spatial_compound.name=Spatial Compound +item.contenttweaker.puzzle_solution_freedskystone.name=Puzzle Solution: Freed Sky Stone +item.contenttweaker.alchemical_deep_rock.name=Alchemical Deep Rock +item.contenttweaker.hypercharged_wool.name=Hypercharged Wool +item.contenttweaker.hypercharged_redstone.name=Hypercharged Redstone +item.contenttweaker.core_of_the_mythic_shells.name=Core of the Mythic Shells +item.contenttweaker.actualization_of_glory.name=Actualization of Glory +item.contenttweaker.actualization_of_knowledge.name=Actualization of Knowledge +item.contenttweaker.actualization_of_balance.name=Actualization of Balance +item.contenttweaker.actualization_of_hope.name=Actualization of Hope +item.contenttweaker.unbound_recursium_fragment.name=Unbound Recursium Fragment +item.contenttweaker.embodiment_of_glory.name=Embodiment of Glory +item.contenttweaker.embodiment_of_balance.name=Embodiment of Balance +item.contenttweaker.embodiment_of_hope.name=Embodiment of Hope +item.contenttweaker.embodiment_of_knowledge.name=Embodiment of Knowledge +item.contenttweaker.shard_of_restored_faith.name=Shard of Restored Faith +item.contenttweaker.shard_of_forgotten_fear_of_death.name=Shard of Forgotten Fear of Death +item.contenttweaker.shard_of_forgiven_lost_time.name=Shard of Forgiven Lost Time +item.contenttweaker.shard_of_rekindled_heritage.name=Shard of Rekindled Heritage +item.contenttweaker.shard_of_no_hidden_intentions.name=Shard of Open Intentions +item.contenttweaker.shard_of_physical_healing.name=Shard of Good Physical Health +item.contenttweaker.shard_of_realized_worth.name=Shard of Realized Worth +item.contenttweaker.shard_of_restored_relationship.name=Shard of Restored Relationships +item.contenttweaker.shard_of_surrender.name=Shard of Peaceful Surrender +item.contenttweaker.shard_of_individual_freedom.name=Shard of Individual Freedom +item.contenttweaker.shard_of_controlled_gluttony.name=Shard of Controlled Gulosity +item.contenttweaker.shard_of_humble_education.name=Shard of Humble Erudition +item.contenttweaker.living_shard_of_shadesmar.name=Living Shard of Shadesmar +item.contenttweaker.rune_of_freedom.name=Rune of Freedom +item.contenttweaker.freedomsteel_ingot.name=Freedomsteel Ingot +item.contenttweaker.token_of_the_meatball_man.name=Token of the Meatball Man +item.contenttweaker.finis.name=Finis +item.contenttweaker.recursive_iced_coffee_pot.name=Recursive Iced Coffee Pot +item.contenttweaker.hiddenpowercallstone_loot.name=Loot from Hidden Power Callstone +item.contenttweaker.warren_configurator.name=Warren Configurator +item.contenttweaker.actualized_starlight_sphere.name=Actualized Starlight Sphere +item.contenttweaker.seeker_stone.name=Seeker Stone +item.contenttweaker.reality_pebble.name=Reality Pebble +item.contenttweaker.opalescent_matter.name=Opalescent Matter +item.contenttweaker.unleashed_mithril_1.name=Unleashed Mithril: Lover +item.contenttweaker.unleashed_mithril_2.name=Unleashed Mithril: Loved +item.contenttweaker.unleashed_mithril_3.name=Unleashed Mithril: Love +item.contenttweaker.echo_warren_alloy.name=Echo Warren Alloy Ingot +item.contenttweaker.actualized_warren_alloy.name=Actualized Warren Alloy Ingot +item.contenttweaker.blade_of_the_samurai_queen.name=Blade of the Samurai Bee +item.contenttweaker.alchemical_dust.name=Alchemical Dust +item.contenttweaker.arcane_fissile_alloy.name=Arcane Fissile Alloy +item.contenttweaker.apothecary_fissile_alloy.name=Apothecary Fissile Alloy +item.contenttweaker.silvan_fissile_alloy.name=Silvan Fissile Alloy +item.contenttweaker.innerved_fissile_alloy.name=Innerved Fissile Alloy +item.contenttweaker.radiant_fissile_alloy.name=Radiant Fissile Alloy +item.contenttweaker.depleted_arcane_fissile_alloy.name=Depleted Arcane Fissile Alloy +item.contenttweaker.depleted_apothecary_fissile_alloy.name=Depleted Apothecary Fissile Alloy +item.contenttweaker.depleted_silvan_fissile_alloy.name=Depleted Silvan Fissile Alloy +item.contenttweaker.depleted_innerved_fissile_alloy.name=Depleted Innerved Fissile Alloy +item.contenttweaker.depleted_radiant_fissile_alloy.name=Depleted Radiant Fissile Alloy +item.contenttweaker.arcane_fissile_dust.name=Arcane Fissile Dust +item.contenttweaker.apothecary_fissile_dust.name=Apothecary Fissile Dust +item.contenttweaker.silvan_fissile_dust.name=Silvan Fissile Dust +item.contenttweaker.innerved_fissile_dust.name=Innerved Fissile Dust +item.contenttweaker.radiant_fissile_dust.name=Radiant Fissile Dust +item.contenttweaker.kampylotitum.name=Kampylotitum Ingot +item.contenttweaker.elleipsinyum.name=Elleipsynium +item.contenttweaker.ekkremesynium.name=Ekkremesynium +item.contenttweaker.soul_of_kashan.name=Soul of Kashan +item.contenttweaker.pure_twilight_matter.name=Pure Twilight Matter +item.contenttweaker.shard_of_the_cosmos.name=Shard of the Cosmos +item.contenttweaker.true_tongue_oath.name=Oath in the True Tongue +item.contenttweaker.trinity_runes.name=Trinity Runes +item.contenttweaker.runes_of_the_lover.name=Runes of the Lover +item.contenttweaker.runes_of_the_loved.name=Runes of the Loved +item.contenttweaker.runes_of_the_love.name=Runes of the Love +item.contenttweaker.stone_of_the_lover.name=Stone of the Lover +item.contenttweaker.stone_of_the_loved.name=Stone of the Loved +item.contenttweaker.stone_of_the_love.name=Stone of the Love +item.contenttweaker.call_of_the_lover.name=Call of the Lover +item.contenttweaker.call_of_the_loved.name=Call of the Loved +item.contenttweaker.call_of_the_love.name=Call of the Love +item.contenttweaker.puzzle_solution_cherubim.name=Puzzle Solution: Trinitas Cherubims +item.contenttweaker.unleashed_triquetra.name=Unleashed Triquetra +item.contenttweaker.cuendillar_catalyst_1.name=Cuendillar Catalyst of the Lover +item.contenttweaker.cuendillar_catalyst_2.name=Cuendillar Catalyst of the Loved +item.contenttweaker.cuendillar_catalyst_3.name=Cuendillar Catalyst of the Love +item.contenttweaker.singular_fractal.name=Singular Fractal +item.contenttweaker.infinite_processor.name=Infinite Processor +item.contenttweaker.recursive_quantum.name=Recursive Quantum +item.contenttweaker.fractallite_quantum.name=Fractallite Quantum +item.contenttweaker.plate_clump_recursive.name=Recursive Quantum Clump +item.contenttweaker.plate_clump_fractal.name=Fractal Quantum Clump +item.contenttweaker.slightly_dense_pebble.name=A Slightly Dense Pebble +item.contenttweaker.standard_of_the_shyre_empire.name=Standard of the Shyre Empire +item.contenttweaker.spooder_glasses.name=Spooder Glasses +item.contenttweaker.massive_boomboom.name=Massive Boom-Boom +item.contenttweaker.emc_crown.name=EMC Crown +item.contenttweaker.cosmic_pot.name=Cosmic Pot +item.contenttweaker.recursion_of_the_lover.name=Recursion of the Lover +item.contenttweaker.recursion_of_the_loved.name=recursion of the Loved +item.contenttweaker.recursion_of_the_love.name=Recursion of the Love +item.contenttweaker.atomic_glasses.name=Atomic Glasses +item.contenttweaker.cool_walking_stick.name=Cool Walking Stick +item.contenttweaker.horrible_unedited_fanfiction.name=Horrible Unedited Fanfiction +item.contenttweaker.null_pointer.name=Null Pointer +item.contenttweaker.p0rtals_redish_white_hat.name=P0rtal's Redish White Hat +item.contenttweaker.collar_bells.name=Collar Bells +item.contenttweaker.shield_of_the_arbiter.name=Shield of the Arbiter +item.contenttweaker.trinity_ingot.name=Trinity Ingot +item.contenttweaker.big_bang_matter.name=Big Bang Matter +item.contenttweaker.ascended_gallifreyan_alloy.name=Ascended Gallifreyan Alloy Ingot +item.contenttweaker.token_of_forgiveness.name=Token of Forgiveness +item.contenttweaker.offer_of_restored_balance.name=Offer of Restored Balance +item.contenttweaker.gem_of_pure_taint.name=Gem of Pure Taint +item.contenttweaker.tainted_claw.name=Tainted Claw +item.contenttweaker.void_chains.name=Void Chains +item.contenttweaker.void_ichorium_gem.name=Void Ichorium Gem +item.contenttweaker.charm_of_the_falling_tower.name=Charm of the Falling Tower +item.contenttweaker.multiblock_input_swapping.name=Multiblock Input Swapping +item.contenttweaker.cursed_dragon_egg.name=Cursed Dragon Egg +item.contenttweaker.tainted_alchemic_catalyst.name=Tainted Alchemic Catalyst +item.contenttweaker.recursion_of_taint.name=Recursion of Taint +item.contenttweaker.shield_of_the_king_in_Purple.name=Shield of the King in Purple +item.contenttweaker.taint_shield.name=Taint Shield +item.contenttweaker.taint_gun.name=Taint Gun +item.contenttweaker.the:ultimate_taint_gun.name=The Ultimate Taint Gun +item.contenttweaker.uncanny_void_cluster.name=Uncanny Void Cluster +item.contenttweaker.puzzle_solution_undeadsoil.name=Puzzle SOlution: Undead Soil +item.contenttweaker.respect_of_the_lord_of_lust.name=Respect of the Lord of Lust +item.contenttweaker.respect_of_the_lord_of_pride.name=Respect of the Lord of Pride +item.contenttweaker.respect_of_the_lord_of_envy.name=Respect of the Lord of Envy +item.contenttweaker.respect_of_the_lord_of_greed.name=Respect of the Lord of Greed +item.contenttweaker.respect_of_the_lord_of_wrath.name=Respect of the Lord of Wrath +item.contenttweaker.respect_of_the_lord_of_sloth.name=Respect of the Lord of Sloth +item.contenttweaker.oath_of_the_lord_of_gluttony.name=Oath of the Lord of Gluttony +item.contenttweaker.respect_of_death.name=Respect of Death +item.contenttweaker.puzzle_solution_vowtodeath.name=Puzzle Solution: Vow to Death +item.contenttweaker.fractallite_taint.name=Fractallite Taint +item.contenttweaker.recursion_of_gluttony.name=Recursion of Gluttony +item.contenttweaker.wish_of_infinity.name=Wish of Infinity +item.contenttweaker.ingot_of_infinite_wishes.name=Ingot of Infinite Wishes +item.contenttweaker.gun_devil_limb.name=Gun Devil Limb +item.contenttweaker.bullet_of_the_gun_devil.name=Bullet of the Gun devil +item.contenttweaker.magazine_of_the_gun_devil.name=Magazine of the Gun Devil +item.contenttweaker.universal_constellation.name=Universal Constellation +item.contenttweaker.dust_of_infinite_wishes.name=Dust of Infinite Wishes +item.contenttweaker.eleint_stone.name=Stone of the Eleint +item.contenttweaker.gem_of_dimensional_ascension.name=Gem of Dimensional Ascension +item.contenttweaker.puzzle_solution_dimensionalascension.name=Puzzle Solution: Dimensional AScension +item.contenttweaker.recursion_of_dimensional_ascension.name=Recursion of Dimensional Ascension +item.contenttweaker.infinite_tainted_plate.name=Infinite Tainted Plate +item.contenttweaker.fiery_recursion_fragment.name=Fiery Recursion Fragment +item.contenttweaker.everburning_dust.name=Everburning Dust +item.contenttweaker.everburning_recursion_fragment.name=Everburning Recursion Fragment +item.contenttweaker.everburning_plating.name=Everburning Plating +item.contenttweaker.quasar_charged_gem.name=Quasar Charged Gem +item.contenttweaker.gravitational_time_crystal.name=Gravitational Time Crystal +item.contenttweaker.time_crystal_lattice.name=Time Crystal Lattice +item.contenttweaker.warren_plate.name=Warren Plate +item.contenttweaker.shield_of_the_king_in_purple.name=Shield of the King in Purple +item.contenttweaker.the_ultimate_taint_gun.name=The Ultimate Taint Gun +item.contenttweaker.power_wrought_brightsteel_alloy_plate.name=Power-Wrought Brightsteel Alloy Plate +item.contenttweaker.quasar_charged_dust.name=Quasar-Charged Dust +item.contenttweaker.cleansed_brightsteel_alloy_plate.name=Cleansed Brightsteel Alloy Plate +item.contenttweaker.dimensionally_ascended_garnet.name=Dimensionally Ascended Garnet +item.contenttweaker.alchemically_hyperactive_crystal.name=Alchemically Hyperactive Crystal +item.contenttweaker.dark_matter_scattering_element.name=Dark Matter Scattering Element +item.contenttweaker.fractal_metal_clump.name=Fractal Metal Clump +item.contenttweaker.fractal_metal_plate.name=Fractal Metal Plate +item.contenttweaker.trinity_nugget.name=Trinity Nugget +item.contenttweaker.echo_warren_bar.name=Echo Warren Bar +item.contenttweaker.galaxy_superconductor.name=Galaxy Superconductor +item.contenttweaker.fractallite_focus_lens.name=Fractallite Focus Lens +item.contenttweaker.cosmic_string_primer.name=Cosmic String Primer +item.contenttweaker.cosmic_string.name=Cosmic String +item.contenttweaker.nightmare_of_annoyance.name=Nightmare of Annoyance +item.contenttweaker.strange_stone_essence.name=Strange Stone Essence +item.contenttweaker.neutronium_pearl.name=Neutronium Pearl +item.contenttweaker.mixed_metal_shard.name=Mixed Metal Shard +item.contenttweaker.black_hole_alloy_clump.name=Black Hole Alloy Clump +item.contenttweaker.softened_black_hole_alloy_clump.name=Softened Black Hole Alloy Clump +item.contenttweaker.drawn_black_hole_alloy_clump.name=Drawn Black Hole Alloy Clump +item.contenttweaker.quenched_black_hole_alloy_clump.name=Quenched Black Hole Alloy Clump +item.contenttweaker.black_hole_alloy_ingot.name=Black Hole Alloy Ingot +item.contenttweaker.galactic_core.name=Galactic Core +item.contenttweaker.galactic_power_unit.name=Galactic Power Unit +item.contenttweaker.cosmic_string_conduit.name=Cosmic String Conduit +item.contenttweaker.eye_of_harmony_power_unit.name=Eye of Harmony Power Unit +item.contenttweaker.defined_bar.name=Defined Bar +item.contenttweaker.salt_of_knowledge.name=Salt of Knowledge +item.contenttweaker.clearing_taint.name=Clearing Taint +item.contenttweaker.lost_cities_worldgen.name=Found in the Lost Cities +item.contenttweaker.experience_configurator.name=Experience Configurator +item.contenttweaker.stone_of_dimensional_ascension.name=Stone of Dimensional Ascension +item.contenttweaker.astral_mastery_tome.name=Tome of Astral Mastery +item.contenttweaker.master_spell_infernum.name=Master Spell: Infernum +item.contenttweaker.master_spell_sonus.name=Master Spell: Sonus +item.contenttweaker.master_spell_gognitio.name=Master Spell: Cognitio +item.contenttweaker.white_hole_core.name=White Hole Core +item.contenttweaker.quasar_core.name=Quasar Core +item.contenttweaker.call_to_mission.name=Call to Mission +item.contenttweaker.summons_of_the_realmshifter_cherubim.name=Summons to the Realmshifter Cherubims +item.contenttweaker.prayer_to_the_trinity_of_love.name=Plea to the Trinity of Love +item.contenttweaker.key_of_restored_balance.name=Key of Restored Balance +item.contenttweaker.void_ichorium_jewel.name=Void Ichorium Jewel +item.contenttweaker.void_ichorium_rift.name=Void Ichorium Rift +item.contenttweaker.summons_to_the_meatball_man.name=Summons to the Meatball Man +item.contenttweaker.vow_to_death.name=Vow to Death +tile.contenttweaker.ascended_spatial_chassis.name=Ascended Spatial Chassis +tile.contenttweaker.actualizing_casing.name=Actualizing Casing +tile.contenttweaker.hyperuranion_actualized_naquadah.name=Hyperuranion Actualizer: Naquadah +tile.contenttweaker.hyperuranion_actualized_dragonsteel.name=Hyperuranion Actualizer: Dragonsteel +tile.contenttweaker.hyperuranion_actualized_dimshard.name=Hyperuranion Actualizer: Dimensional Shards +tile.contenttweaker.hyperuranion_actualized_rhenia.name=Hyperuranion Actualizer: Rhenium +tile.contenttweaker.recursive_brain.name=Recursive Brain +tile.contenttweaker.recursive_brain_plug.name=Recursive Brain Plug +tile.contenttweaker.hyperuranion_conduit.name=Hyperuranion Conduit +tile.contenttweaker.hyperuranion_casing.name=Hyperuranion Casing +tile.contenttweaker.horizon_sustainer.name=Horizon Sustainer +tile.contenttweaker.dyson_extruder.name=Dyson Extruder +tile.contenttweaker.exotic_absorber.name=Exotic Absorber +tile.contenttweaker.exotic_dyson_conduit.name=Exotic Dyson Conduit +tile.contenttweaker.mortum_livingrock.name=Mortum Livingrock +tile.contenttweaker.mortum_livingwood.name=Mortum Livingwood +tile.contenttweaker.focused_plasma_collider.name=Focused Plasma Collider +tile.contenttweaker.superfocused_plasma_collider.name=Superfocused Plasma Collider +tile.contenttweaker.hyperfocused_plasma_collider.name=Hyperfocused Plasma Collider +tile.contenttweaker.stormlight_stone.name=Stormlight Stone +tile.contenttweaker.stone_of_shadesmar.name=Stone of Shadesmar +tile.contenttweaker.catalyst_of_the_warrens.name=Catalyst of the Warrens +tile.contenttweaker.absolutely_autentic_rainbowgen.name=Absolutely Authentic Rainbow Generator +tile.contenttweaker.balanced_machine_casing.name=Balanced Machine Casing +tile.contenttweaker.gallifreyan_neutronium_casing.name=Gallifreyan Neutronium Casing +tile.contenttweaker.quark_neutronium_module.name=Quark Neutronium Module +tile.contenttweaker.hyperuranium_actualizer_ichor.name=Hyperuranion Actualizer: Ichor +tile.contenttweaker.undead_soil.name=Undead Soil +tile.contenttweaker.fractallite_halite_stone.name=Fractallite Halite Stone +tile.contenttweaker.catalyst_of_balance.name=Catalyst of Balance +tile.contenttweaker.space_time_beam.name=Space-Time Beam +tile.contenttweaker.quasar_stabilizer.name=Quasar Stabilizer +tile.contenttweaker.quasar_screen.name=Quasar Screen +tile.contenttweaker.galaxy_conduit.name=Galaxy Conduit +tile.contenttweaker.echo_warren_stone.name=Echo Warren Stone +tile.contenttweaker.galaxy_accelerator.name=Galaxy Accelerator +tile.contenttweaker.miniature_quasar.name=Miniature Quasar +tile.contenttweaker.ascended_fluix_etcher.name=Ascended Fluix Etcher +tile.contenttweaker.naquadah_casing.name=Naquadah Casing +tile.contenttweaker.dark_matter_node.name=Dark Matter Node +tile.contenttweaker.cosmic_balance_coil.name=Cosmic Balance Coil +tile.contenttweaker.toroid_galaxy_tube.name=Toroid Galaxy Tube +tile.contenttweaker.stone_of_worthiness.name=Stone of Worthiness +tile.contenttweaker.recurring_nightmare_block.name=Recurring Nightmare Block +tile.contenttweaker.trinity_neutronium_casing.name=Trinity Neutronium Casing +tile.contenttweaker.quark_cosmic_module.name=Cosmic String Module +tile.contenttweaker.tardis_casing.name=Tardis Casing +tile.contenttweaker.tardis_stem.name=Tardis Stem +tile.contenttweaker.tardis_branch.name=Tardis Branch +tile.contenttweaker.tardis_polyp.name=Tardis Polyp +tile.contenttweaker.nineteen_blocks.name=Nineteen Blocks +tile.contenttweaker.wormhole_field_module.name=Wormhole Field Module +tile.contenttweaker.fabric_of_the_orb.name=Fabric of the Orb +tile.contenttweaker.miniature_white_hole.name=Miniature White Hole +item.contenttweaker.supercharged_signalum.name=Supercharged Signalum Ingot +item.contenttweaker.charged_signalum.name=Charged Signalum Ingot diff --git a/resources/contenttweaker/models/item/charged_signalum.json b/resources/contenttweaker/models/item/charged_signalum.json new file mode 100644 index 00000000..d5f14b6c --- /dev/null +++ b/resources/contenttweaker/models/item/charged_signalum.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/charged_signalum" + } +} diff --git a/resources/contenttweaker/models/item/clearing_taint.json b/resources/contenttweaker/models/item/clearing_taint.json new file mode 100644 index 00000000..85be7536 --- /dev/null +++ b/resources/contenttweaker/models/item/clearing_taint.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/clearing_taint" + } +} diff --git a/resources/contenttweaker/models/item/experience_configurator.json b/resources/contenttweaker/models/item/experience_configurator.json new file mode 100644 index 00000000..951ea4d6 --- /dev/null +++ b/resources/contenttweaker/models/item/experience_configurator.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/experience_configurator" + } +} diff --git a/resources/contenttweaker/models/item/lively_tree_callstone.json b/resources/contenttweaker/models/item/lively_tree_callstone.json new file mode 100644 index 00000000..b9e9e51d --- /dev/null +++ b/resources/contenttweaker/models/item/lively_tree_callstone.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/lively_tree_callstone" + } +} diff --git a/resources/contenttweaker/models/item/lost_cities_worldgen.json b/resources/contenttweaker/models/item/lost_cities_worldgen.json new file mode 100644 index 00000000..0655c379 --- /dev/null +++ b/resources/contenttweaker/models/item/lost_cities_worldgen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/lost_cities_worldgen" + } +} diff --git a/resources/contenttweaker/models/item/master_spell_cognitio.json b/resources/contenttweaker/models/item/master_spell_cognitio.json new file mode 100644 index 00000000..32c2cec4 --- /dev/null +++ b/resources/contenttweaker/models/item/master_spell_cognitio.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/master_spell_cognitio" + } +} diff --git a/resources/contenttweaker/models/item/master_spell_sonus.json b/resources/contenttweaker/models/item/master_spell_sonus.json new file mode 100644 index 00000000..fec4b8a1 --- /dev/null +++ b/resources/contenttweaker/models/item/master_spell_sonus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/master_spell_sonus" + } +} diff --git a/resources/contenttweaker/models/item/salt_of_knowledge.json b/resources/contenttweaker/models/item/salt_of_knowledge.json new file mode 100644 index 00000000..7bcd4234 --- /dev/null +++ b/resources/contenttweaker/models/item/salt_of_knowledge.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/salt_of_knowledge" + } +} diff --git a/resources/contenttweaker/models/item/supercharged_signalum.json b/resources/contenttweaker/models/item/supercharged_signalum.json new file mode 100644 index 00000000..01b842b7 --- /dev/null +++ b/resources/contenttweaker/models/item/supercharged_signalum.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/supercharged_signalum" + } +} diff --git a/resources/contenttweaker/textures/blocks/absolutely_autentic_rainbowgen.png b/resources/contenttweaker/textures/blocks/absolutely_autentic_rainbowgen.png new file mode 100644 index 00000000..2168c619 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/absolutely_autentic_rainbowgen.png differ diff --git a/resources/contenttweaker/textures/blocks/akathartos_portal_block.png b/resources/contenttweaker/textures/blocks/akathartos_portal_block.png new file mode 100644 index 00000000..97f01f17 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/akathartos_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/akathartos_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/akathartos_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/akathartos_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/alkemia_portal_block.png b/resources/contenttweaker/textures/blocks/alkemia_portal_block.png new file mode 100644 index 00000000..0f59eb7c Binary files /dev/null and b/resources/contenttweaker/textures/blocks/alkemia_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/alkemia_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/alkemia_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/alkemia_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/apichisi_portal_block.png b/resources/contenttweaker/textures/blocks/apichisi_portal_block.png new file mode 100644 index 00000000..28763784 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/apichisi_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/apichisi_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/apichisi_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/apichisi_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/ascended_fluix_etcher.png b/resources/contenttweaker/textures/blocks/ascended_fluix_etcher.png new file mode 100644 index 00000000..7dccaaa1 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/ascended_fluix_etcher.png differ diff --git a/resources/contenttweaker/textures/blocks/catalyst_of_the_warrens.png b/resources/contenttweaker/textures/blocks/catalyst_of_the_warrens.png new file mode 100644 index 00000000..5ccef09f Binary files /dev/null and b/resources/contenttweaker/textures/blocks/catalyst_of_the_warrens.png differ diff --git a/resources/contenttweaker/textures/blocks/cosmic_balance_coil.png b/resources/contenttweaker/textures/blocks/cosmic_balance_coil.png new file mode 100644 index 00000000..c6b39ed8 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/cosmic_balance_coil.png differ diff --git a/resources/contenttweaker/textures/blocks/cosmic_balance_coil.png.mcmeta b/resources/contenttweaker/textures/blocks/cosmic_balance_coil.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/cosmic_balance_coil.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/cosmic_string_module.png b/resources/contenttweaker/textures/blocks/cosmic_string_module.png new file mode 100644 index 00000000..5054dc2b Binary files /dev/null and b/resources/contenttweaker/textures/blocks/cosmic_string_module.png differ diff --git a/resources/contenttweaker/textures/blocks/diamerisma_portal_block.png b/resources/contenttweaker/textures/blocks/diamerisma_portal_block.png new file mode 100644 index 00000000..806bd83b Binary files /dev/null and b/resources/contenttweaker/textures/blocks/diamerisma_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/diamerisma_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/diamerisma_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/diamerisma_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/echo_warren_stone.png b/resources/contenttweaker/textures/blocks/echo_warren_stone.png new file mode 100644 index 00000000..c058cc1a Binary files /dev/null and b/resources/contenttweaker/textures/blocks/echo_warren_stone.png differ diff --git a/resources/contenttweaker/textures/blocks/europa_portal_block.png b/resources/contenttweaker/textures/blocks/europa_portal_block.png new file mode 100644 index 00000000..d2e3e9b8 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/europa_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/europa_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/europa_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/europa_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/fabric_of_the_orb.png b/resources/contenttweaker/textures/blocks/fabric_of_the_orb.png new file mode 100644 index 00000000..5267972e Binary files /dev/null and b/resources/contenttweaker/textures/blocks/fabric_of_the_orb.png differ diff --git a/resources/contenttweaker/textures/blocks/falacer_portal_block.png b/resources/contenttweaker/textures/blocks/falacer_portal_block.png new file mode 100644 index 00000000..9aa6f5f0 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/falacer_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/falacer_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/falacer_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/falacer_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/finem_portal_block.png b/resources/contenttweaker/textures/blocks/finem_portal_block.png new file mode 100644 index 00000000..9ea477e5 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/finem_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/finem_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/finem_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/finem_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/focused_plasma_collider.png b/resources/contenttweaker/textures/blocks/focused_plasma_collider.png new file mode 100644 index 00000000..cce7b29d Binary files /dev/null and b/resources/contenttweaker/textures/blocks/focused_plasma_collider.png differ diff --git a/resources/contenttweaker/textures/blocks/focused_plasma_collider.png.mcmeta b/resources/contenttweaker/textures/blocks/focused_plasma_collider.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/blocks/focused_plasma_collider.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/blocks/fractallite_halite_stone.png b/resources/contenttweaker/textures/blocks/fractallite_halite_stone.png new file mode 100644 index 00000000..a79cd0da Binary files /dev/null and b/resources/contenttweaker/textures/blocks/fractallite_halite_stone.png differ diff --git a/resources/contenttweaker/textures/blocks/fractallite_halite_stone.png.mcmeta b/resources/contenttweaker/textures/blocks/fractallite_halite_stone.png.mcmeta new file mode 100644 index 00000000..e8ac9bc3 --- /dev/null +++ b/resources/contenttweaker/textures/blocks/fractallite_halite_stone.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 5 + } +} diff --git a/resources/contenttweaker/textures/blocks/fractallite_stone_of_love.png b/resources/contenttweaker/textures/blocks/fractallite_stone_of_love.png new file mode 100644 index 00000000..18fc5166 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/fractallite_stone_of_love.png differ diff --git a/resources/contenttweaker/textures/blocks/furatto_portal_block.png b/resources/contenttweaker/textures/blocks/furatto_portal_block.png new file mode 100644 index 00000000..033e47ca Binary files /dev/null and b/resources/contenttweaker/textures/blocks/furatto_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/furatto_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/furatto_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/furatto_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/galaxy_accelerator.png b/resources/contenttweaker/textures/blocks/galaxy_accelerator.png new file mode 100644 index 00000000..61ed707b Binary files /dev/null and b/resources/contenttweaker/textures/blocks/galaxy_accelerator.png differ diff --git a/resources/contenttweaker/textures/blocks/gallifrey_portal_block.png b/resources/contenttweaker/textures/blocks/gallifrey_portal_block.png new file mode 100644 index 00000000..28763784 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/gallifrey_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/gallifrey_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/gallifrey_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/gallifrey_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/gallifreyan_neutronium_casing.png b/resources/contenttweaker/textures/blocks/gallifreyan_neutronium_casing.png new file mode 100644 index 00000000..3b38df5e Binary files /dev/null and b/resources/contenttweaker/textures/blocks/gallifreyan_neutronium_casing.png differ diff --git a/resources/contenttweaker/textures/blocks/halite_bejewelled_ichorium_catalyst.png b/resources/contenttweaker/textures/blocks/halite_bejewelled_ichorium_catalyst.png new file mode 100644 index 00000000..31c899c0 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/halite_bejewelled_ichorium_catalyst.png differ diff --git a/resources/contenttweaker/textures/blocks/hator_portal_block.png b/resources/contenttweaker/textures/blocks/hator_portal_block.png new file mode 100644 index 00000000..f99f1f99 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/hator_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/hator_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/hator_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/hator_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/haumea_portal_block.png b/resources/contenttweaker/textures/blocks/haumea_portal_block.png new file mode 100644 index 00000000..76cc6ec1 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/haumea_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/haumea_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/haumea_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/haumea_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/hyperfocused_plasma_collider.png b/resources/contenttweaker/textures/blocks/hyperfocused_plasma_collider.png new file mode 100644 index 00000000..5b0492f5 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/hyperfocused_plasma_collider.png differ diff --git a/resources/contenttweaker/textures/blocks/hyperfocused_plasma_collider.png.mcmeta b/resources/contenttweaker/textures/blocks/hyperfocused_plasma_collider.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/blocks/hyperfocused_plasma_collider.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/blocks/hyperuranion_actualizer_dimshard.png b/resources/contenttweaker/textures/blocks/hyperuranion_actualizer_dimshard.png new file mode 100644 index 00000000..51bf0afa Binary files /dev/null and b/resources/contenttweaker/textures/blocks/hyperuranion_actualizer_dimshard.png differ diff --git a/resources/contenttweaker/textures/blocks/hyperuranion_actualizer_dragonsteel.png b/resources/contenttweaker/textures/blocks/hyperuranion_actualizer_dragonsteel.png new file mode 100644 index 00000000..f0cdec48 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/hyperuranion_actualizer_dragonsteel.png differ diff --git a/resources/contenttweaker/textures/blocks/hyperuranion_actualizer_ichor.png b/resources/contenttweaker/textures/blocks/hyperuranion_actualizer_ichor.png new file mode 100644 index 00000000..51181c1f Binary files /dev/null and b/resources/contenttweaker/textures/blocks/hyperuranion_actualizer_ichor.png differ diff --git a/resources/contenttweaker/textures/blocks/hyperuranion_actualizer_naquadah.png b/resources/contenttweaker/textures/blocks/hyperuranion_actualizer_naquadah.png new file mode 100644 index 00000000..9e036238 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/hyperuranion_actualizer_naquadah.png differ diff --git a/resources/contenttweaker/textures/blocks/hyperuranion_actualizer_rhenia.png b/resources/contenttweaker/textures/blocks/hyperuranion_actualizer_rhenia.png new file mode 100644 index 00000000..1b64fe5e Binary files /dev/null and b/resources/contenttweaker/textures/blocks/hyperuranion_actualizer_rhenia.png differ diff --git a/resources/contenttweaker/textures/blocks/ichorium_void_stone.png b/resources/contenttweaker/textures/blocks/ichorium_void_stone.png new file mode 100644 index 00000000..ee8c0437 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/ichorium_void_stone.png differ diff --git a/resources/contenttweaker/textures/blocks/luna_portal_block.png b/resources/contenttweaker/textures/blocks/luna_portal_block.png new file mode 100644 index 00000000..a2764fb8 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/luna_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/luna_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/luna_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/luna_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/lyndenwyrm_portal_block.png b/resources/contenttweaker/textures/blocks/lyndenwyrm_portal_block.png new file mode 100644 index 00000000..880b4e7b Binary files /dev/null and b/resources/contenttweaker/textures/blocks/lyndenwyrm_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/lyndenwyrm_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/lyndenwyrm_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/lyndenwyrm_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/miniature_quasar.png b/resources/contenttweaker/textures/blocks/miniature_quasar.png new file mode 100644 index 00000000..15bf9140 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/miniature_quasar.png differ diff --git a/resources/contenttweaker/textures/blocks/miniature_white_hole.png b/resources/contenttweaker/textures/blocks/miniature_white_hole.png new file mode 100644 index 00000000..4b191eae Binary files /dev/null and b/resources/contenttweaker/textures/blocks/miniature_white_hole.png differ diff --git a/resources/contenttweaker/textures/blocks/mortum_livingrock.png b/resources/contenttweaker/textures/blocks/mortum_livingrock.png new file mode 100644 index 00000000..e24791cb Binary files /dev/null and b/resources/contenttweaker/textures/blocks/mortum_livingrock.png differ diff --git a/resources/contenttweaker/textures/blocks/mortum_livingwood.png b/resources/contenttweaker/textures/blocks/mortum_livingwood.png new file mode 100644 index 00000000..88b43b16 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/mortum_livingwood.png differ diff --git a/resources/contenttweaker/textures/blocks/myrmex_portal_block.png b/resources/contenttweaker/textures/blocks/myrmex_portal_block.png new file mode 100644 index 00000000..6eb0384c Binary files /dev/null and b/resources/contenttweaker/textures/blocks/myrmex_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/myrmex_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/myrmex_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/myrmex_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/naquadah_casing.png b/resources/contenttweaker/textures/blocks/naquadah_casing.png new file mode 100644 index 00000000..2eab017f Binary files /dev/null and b/resources/contenttweaker/textures/blocks/naquadah_casing.png differ diff --git a/resources/contenttweaker/textures/blocks/nero_portal_block.png b/resources/contenttweaker/textures/blocks/nero_portal_block.png new file mode 100644 index 00000000..548f4c23 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/nero_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/nero_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/nero_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/nero_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/nineteen_blocks.png b/resources/contenttweaker/textures/blocks/nineteen_blocks.png new file mode 100644 index 00000000..c08a7f79 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/nineteen_blocks.png differ diff --git a/resources/contenttweaker/textures/blocks/oi_portal_block.png b/resources/contenttweaker/textures/blocks/oi_portal_block.png new file mode 100644 index 00000000..4c015904 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/oi_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/oi_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/oi_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/oi_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/orcus_portal_block.png b/resources/contenttweaker/textures/blocks/orcus_portal_block.png new file mode 100644 index 00000000..2399f9ae Binary files /dev/null and b/resources/contenttweaker/textures/blocks/orcus_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/orcus_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/orcus_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/orcus_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/osiris_portal_block.png b/resources/contenttweaker/textures/blocks/osiris_portal_block.png new file mode 100644 index 00000000..c689c190 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/osiris_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/osiris_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/osiris_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/osiris_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/pauram_portal_block.png b/resources/contenttweaker/textures/blocks/pauram_portal_block.png new file mode 100644 index 00000000..e82442e8 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/pauram_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/pauram_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/pauram_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/pauram_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/pixonia_portal_block.png b/resources/contenttweaker/textures/blocks/pixonia_portal_block.png new file mode 100644 index 00000000..46522e45 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/pixonia_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/pixonia_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/pixonia_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/pixonia_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/proxima_portal_block.png b/resources/contenttweaker/textures/blocks/proxima_portal_block.png new file mode 100644 index 00000000..28587ac5 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/proxima_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/proxima_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/proxima_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/proxima_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/ptah_portal_block.png b/resources/contenttweaker/textures/blocks/ptah_portal_block.png new file mode 100644 index 00000000..92dc613b Binary files /dev/null and b/resources/contenttweaker/textures/blocks/ptah_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/ptah_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/ptah_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/ptah_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/quark_cosmic_module.png b/resources/contenttweaker/textures/blocks/quark_cosmic_module.png new file mode 100644 index 00000000..23c88594 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/quark_cosmic_module.png differ diff --git a/resources/contenttweaker/textures/blocks/quark_neutronium_module.png b/resources/contenttweaker/textures/blocks/quark_neutronium_module.png new file mode 100644 index 00000000..17eb98a3 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/quark_neutronium_module.png differ diff --git a/resources/contenttweaker/textures/blocks/recurring_nightmare_block.png b/resources/contenttweaker/textures/blocks/recurring_nightmare_block.png new file mode 100644 index 00000000..d9e0056b Binary files /dev/null and b/resources/contenttweaker/textures/blocks/recurring_nightmare_block.png differ diff --git a/resources/contenttweaker/textures/blocks/rhenia_portal_block.png b/resources/contenttweaker/textures/blocks/rhenia_portal_block.png new file mode 100644 index 00000000..93307f92 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/rhenia_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/rhenia_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/rhenia_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/rhenia_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/seal_of_freedom.png b/resources/contenttweaker/textures/blocks/seal_of_freedom.png new file mode 100644 index 00000000..4619ad91 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/seal_of_freedom.png differ diff --git a/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_blacksmith.png b/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_blacksmith.png new file mode 100644 index 00000000..c169937f Binary files /dev/null and b/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_blacksmith.png differ diff --git a/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_defender.png b/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_defender.png new file mode 100644 index 00000000..eceebac6 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_defender.png differ diff --git a/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_engineer.png b/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_engineer.png new file mode 100644 index 00000000..8fb7bd1a Binary files /dev/null and b/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_engineer.png differ diff --git a/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_experimentalist.png b/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_experimentalist.png new file mode 100644 index 00000000..2a7a8d8a Binary files /dev/null and b/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_experimentalist.png differ diff --git a/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_gemcutter.png b/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_gemcutter.png new file mode 100644 index 00000000..c08067c9 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_gemcutter.png differ diff --git a/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_historian.png b/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_historian.png new file mode 100644 index 00000000..24b61dff Binary files /dev/null and b/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_historian.png differ diff --git a/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_theorist.png b/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_theorist.png new file mode 100644 index 00000000..713b388c Binary files /dev/null and b/resources/contenttweaker/textures/blocks/seal_of_the_arbiter_theorist.png differ diff --git a/resources/contenttweaker/textures/blocks/sedna_portal_block.png b/resources/contenttweaker/textures/blocks/sedna_portal_block.png new file mode 100644 index 00000000..942b0b79 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/sedna_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/sedna_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/sedna_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/sedna_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/stone_of_shadesmar.png b/resources/contenttweaker/textures/blocks/stone_of_shadesmar.png new file mode 100644 index 00000000..db5d1034 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/stone_of_shadesmar.png differ diff --git a/resources/contenttweaker/textures/blocks/stone_of_shadesmar.png.mcmeta b/resources/contenttweaker/textures/blocks/stone_of_shadesmar.png.mcmeta new file mode 100644 index 00000000..a57d64fd --- /dev/null +++ b/resources/contenttweaker/textures/blocks/stone_of_shadesmar.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 4 + } +} diff --git a/resources/contenttweaker/textures/blocks/stone_of_worthiness.png b/resources/contenttweaker/textures/blocks/stone_of_worthiness.png new file mode 100644 index 00000000..a6e70837 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/stone_of_worthiness.png differ diff --git a/resources/contenttweaker/textures/blocks/stormlight_stone.png b/resources/contenttweaker/textures/blocks/stormlight_stone.png new file mode 100644 index 00000000..5a57429d Binary files /dev/null and b/resources/contenttweaker/textures/blocks/stormlight_stone.png differ diff --git a/resources/contenttweaker/textures/blocks/stormlight_stone.png.mcmeta b/resources/contenttweaker/textures/blocks/stormlight_stone.png.mcmeta new file mode 100644 index 00000000..e72658ac --- /dev/null +++ b/resources/contenttweaker/textures/blocks/stormlight_stone.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/resources/contenttweaker/textures/blocks/superfocused_plasma_collider.png b/resources/contenttweaker/textures/blocks/superfocused_plasma_collider.png new file mode 100644 index 00000000..df2525bb Binary files /dev/null and b/resources/contenttweaker/textures/blocks/superfocused_plasma_collider.png differ diff --git a/resources/contenttweaker/textures/blocks/superfocused_plasma_collider.png.mcmeta b/resources/contenttweaker/textures/blocks/superfocused_plasma_collider.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/blocks/superfocused_plasma_collider.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/blocks/taerrapiatta_portal_block.png b/resources/contenttweaker/textures/blocks/taerrapiatta_portal_block.png new file mode 100644 index 00000000..27556174 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/taerrapiatta_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/taerrapiatta_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/taerrapiatta_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/taerrapiatta_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/blocks/tardis_casing.png b/resources/contenttweaker/textures/blocks/tardis_casing.png new file mode 100644 index 00000000..dae41695 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/tardis_casing.png differ diff --git a/resources/contenttweaker/textures/blocks/toroid_galaxy_tube.png b/resources/contenttweaker/textures/blocks/toroid_galaxy_tube.png new file mode 100644 index 00000000..597bf5b8 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/toroid_galaxy_tube.png differ diff --git a/resources/contenttweaker/textures/blocks/trinity_neutronium_casing.png b/resources/contenttweaker/textures/blocks/trinity_neutronium_casing.png new file mode 100644 index 00000000..70e82bd7 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/trinity_neutronium_casing.png differ diff --git a/resources/contenttweaker/textures/blocks/trinity_neutronium_casing.png.mcmeta b/resources/contenttweaker/textures/blocks/trinity_neutronium_casing.png.mcmeta new file mode 100644 index 00000000..e8ac9bc3 --- /dev/null +++ b/resources/contenttweaker/textures/blocks/trinity_neutronium_casing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 5 + } +} diff --git a/resources/contenttweaker/textures/blocks/undead_soil.png b/resources/contenttweaker/textures/blocks/undead_soil.png new file mode 100644 index 00000000..c4497bec Binary files /dev/null and b/resources/contenttweaker/textures/blocks/undead_soil.png differ diff --git a/resources/contenttweaker/textures/blocks/void_ichorium_rift_cap.png b/resources/contenttweaker/textures/blocks/void_ichorium_rift_cap.png new file mode 100644 index 00000000..dcb72347 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/void_ichorium_rift_cap.png differ diff --git a/resources/contenttweaker/textures/blocks/wormhole_field_module.png b/resources/contenttweaker/textures/blocks/wormhole_field_module.png new file mode 100644 index 00000000..f6ecd6f7 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/wormhole_field_module.png differ diff --git a/resources/contenttweaker/textures/blocks/zoi_portal_block.png b/resources/contenttweaker/textures/blocks/zoi_portal_block.png new file mode 100644 index 00000000..0a672f18 Binary files /dev/null and b/resources/contenttweaker/textures/blocks/zoi_portal_block.png differ diff --git a/resources/contenttweaker/textures/blocks/zoi_portal_block.png.mcmeta b/resources/contenttweaker/textures/blocks/zoi_portal_block.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/blocks/zoi_portal_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/items/abyssite_crystal.png b/resources/contenttweaker/textures/items/abyssite_crystal.png index 855f0711..a2ca77e7 100644 Binary files a/resources/contenttweaker/textures/items/abyssite_crystal.png and b/resources/contenttweaker/textures/items/abyssite_crystal.png differ diff --git a/resources/contenttweaker/textures/items/actualization_of_balance.png b/resources/contenttweaker/textures/items/actualization_of_balance.png new file mode 100644 index 00000000..2306e599 Binary files /dev/null and b/resources/contenttweaker/textures/items/actualization_of_balance.png differ diff --git a/resources/contenttweaker/textures/items/actualization_of_glory.png b/resources/contenttweaker/textures/items/actualization_of_glory.png new file mode 100644 index 00000000..4926fc23 Binary files /dev/null and b/resources/contenttweaker/textures/items/actualization_of_glory.png differ diff --git a/resources/contenttweaker/textures/items/actualization_of_hope.png b/resources/contenttweaker/textures/items/actualization_of_hope.png new file mode 100644 index 00000000..ce7dbcbe Binary files /dev/null and b/resources/contenttweaker/textures/items/actualization_of_hope.png differ diff --git a/resources/contenttweaker/textures/items/actualization_of_knowledge.png b/resources/contenttweaker/textures/items/actualization_of_knowledge.png new file mode 100644 index 00000000..2f369f54 Binary files /dev/null and b/resources/contenttweaker/textures/items/actualization_of_knowledge.png differ diff --git a/resources/contenttweaker/textures/items/actualized_starlight_sphere.png b/resources/contenttweaker/textures/items/actualized_starlight_sphere.png new file mode 100644 index 00000000..73b6e429 Binary files /dev/null and b/resources/contenttweaker/textures/items/actualized_starlight_sphere.png differ diff --git a/resources/contenttweaker/textures/items/alchemical_deep_rock.png b/resources/contenttweaker/textures/items/alchemical_deep_rock.png new file mode 100644 index 00000000..3237d9fb Binary files /dev/null and b/resources/contenttweaker/textures/items/alchemical_deep_rock.png differ diff --git a/resources/contenttweaker/textures/items/alchemical_dust.png b/resources/contenttweaker/textures/items/alchemical_dust.png new file mode 100644 index 00000000..500f460e Binary files /dev/null and b/resources/contenttweaker/textures/items/alchemical_dust.png differ diff --git a/resources/contenttweaker/textures/items/alchemically_hyperactive_crystal.png b/resources/contenttweaker/textures/items/alchemically_hyperactive_crystal.png new file mode 100644 index 00000000..eb50c64a Binary files /dev/null and b/resources/contenttweaker/textures/items/alchemically_hyperactive_crystal.png differ diff --git a/resources/contenttweaker/textures/items/antimony_crystal.png b/resources/contenttweaker/textures/items/antimony_crystal.png index 8d8e9c5b..0dbf924e 100644 Binary files a/resources/contenttweaker/textures/items/antimony_crystal.png and b/resources/contenttweaker/textures/items/antimony_crystal.png differ diff --git a/resources/contenttweaker/textures/items/apothecary_fissile_alloy.png b/resources/contenttweaker/textures/items/apothecary_fissile_alloy.png new file mode 100644 index 00000000..bf098ad1 Binary files /dev/null and b/resources/contenttweaker/textures/items/apothecary_fissile_alloy.png differ diff --git a/resources/contenttweaker/textures/items/apothecary_fissile_alloy.png.mcmeta b/resources/contenttweaker/textures/items/apothecary_fissile_alloy.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/apothecary_fissile_alloy.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/apothecary_fissile_dust.png b/resources/contenttweaker/textures/items/apothecary_fissile_dust.png new file mode 100644 index 00000000..3ab4e1e8 Binary files /dev/null and b/resources/contenttweaker/textures/items/apothecary_fissile_dust.png differ diff --git a/resources/contenttweaker/textures/items/arbiterite_crystal.png b/resources/contenttweaker/textures/items/arbiterite_crystal.png index 559a18ab..26e3e68b 100644 Binary files a/resources/contenttweaker/textures/items/arbiterite_crystal.png and b/resources/contenttweaker/textures/items/arbiterite_crystal.png differ diff --git a/resources/contenttweaker/textures/items/arcane_fissile_dust.png b/resources/contenttweaker/textures/items/arcane_fissile_dust.png new file mode 100644 index 00000000..74da23c7 Binary files /dev/null and b/resources/contenttweaker/textures/items/arcane_fissile_dust.png differ diff --git a/resources/contenttweaker/textures/items/ascended_gallifreyan_alloy.png b/resources/contenttweaker/textures/items/ascended_gallifreyan_alloy.png new file mode 100644 index 00000000..cdd98577 Binary files /dev/null and b/resources/contenttweaker/textures/items/ascended_gallifreyan_alloy.png differ diff --git a/resources/contenttweaker/textures/items/ascended_gallifreyan_alloy.png.mcmeta b/resources/contenttweaker/textures/items/ascended_gallifreyan_alloy.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/items/ascended_gallifreyan_alloy.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/items/astral_insight_10.png b/resources/contenttweaker/textures/items/astral_insight_10.png new file mode 100644 index 00000000..fb45dc10 Binary files /dev/null and b/resources/contenttweaker/textures/items/astral_insight_10.png differ diff --git a/resources/contenttweaker/textures/items/astral_insight_100.png b/resources/contenttweaker/textures/items/astral_insight_100.png new file mode 100644 index 00000000..92a62252 Binary files /dev/null and b/resources/contenttweaker/textures/items/astral_insight_100.png differ diff --git a/resources/contenttweaker/textures/items/astral_insight_20.png b/resources/contenttweaker/textures/items/astral_insight_20.png new file mode 100644 index 00000000..ba0ddd96 Binary files /dev/null and b/resources/contenttweaker/textures/items/astral_insight_20.png differ diff --git a/resources/contenttweaker/textures/items/astral_insight_30.png b/resources/contenttweaker/textures/items/astral_insight_30.png new file mode 100644 index 00000000..7cee8d06 Binary files /dev/null and b/resources/contenttweaker/textures/items/astral_insight_30.png differ diff --git a/resources/contenttweaker/textures/items/astral_insight_40.png b/resources/contenttweaker/textures/items/astral_insight_40.png new file mode 100644 index 00000000..2823ccd1 Binary files /dev/null and b/resources/contenttweaker/textures/items/astral_insight_40.png differ diff --git a/resources/contenttweaker/textures/items/astral_insight_50.png b/resources/contenttweaker/textures/items/astral_insight_50.png new file mode 100644 index 00000000..19668e3e Binary files /dev/null and b/resources/contenttweaker/textures/items/astral_insight_50.png differ diff --git a/resources/contenttweaker/textures/items/astral_insight_60.png b/resources/contenttweaker/textures/items/astral_insight_60.png new file mode 100644 index 00000000..9ee3ea66 Binary files /dev/null and b/resources/contenttweaker/textures/items/astral_insight_60.png differ diff --git a/resources/contenttweaker/textures/items/astral_insight_70.png b/resources/contenttweaker/textures/items/astral_insight_70.png new file mode 100644 index 00000000..c64d754d Binary files /dev/null and b/resources/contenttweaker/textures/items/astral_insight_70.png differ diff --git a/resources/contenttweaker/textures/items/astral_insight_80.png b/resources/contenttweaker/textures/items/astral_insight_80.png new file mode 100644 index 00000000..3458d565 Binary files /dev/null and b/resources/contenttweaker/textures/items/astral_insight_80.png differ diff --git a/resources/contenttweaker/textures/items/astral_insight_90.png b/resources/contenttweaker/textures/items/astral_insight_90.png new file mode 100644 index 00000000..25ffadd6 Binary files /dev/null and b/resources/contenttweaker/textures/items/astral_insight_90.png differ diff --git a/resources/contenttweaker/textures/items/astral_mastery_tome.png b/resources/contenttweaker/textures/items/astral_mastery_tome.png new file mode 100644 index 00000000..efd71f0d Binary files /dev/null and b/resources/contenttweaker/textures/items/astral_mastery_tome.png differ diff --git a/resources/contenttweaker/textures/items/atomic_glasses.png b/resources/contenttweaker/textures/items/atomic_glasses.png new file mode 100644 index 00000000..0a1a419d Binary files /dev/null and b/resources/contenttweaker/textures/items/atomic_glasses.png differ diff --git a/resources/contenttweaker/textures/items/big_bang_matter.png b/resources/contenttweaker/textures/items/big_bang_matter.png new file mode 100644 index 00000000..c8d7a447 Binary files /dev/null and b/resources/contenttweaker/textures/items/big_bang_matter.png differ diff --git a/resources/contenttweaker/textures/items/black_hole_alloy_clump.png b/resources/contenttweaker/textures/items/black_hole_alloy_clump.png new file mode 100644 index 00000000..3687c358 Binary files /dev/null and b/resources/contenttweaker/textures/items/black_hole_alloy_clump.png differ diff --git a/resources/contenttweaker/textures/items/black_hole_alloy_clump.png.mcmeta b/resources/contenttweaker/textures/items/black_hole_alloy_clump.png.mcmeta new file mode 100644 index 00000000..a1f9b3db --- /dev/null +++ b/resources/contenttweaker/textures/items/black_hole_alloy_clump.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 6 + } +} diff --git a/resources/contenttweaker/textures/items/black_hole_alloy_ingot.png b/resources/contenttweaker/textures/items/black_hole_alloy_ingot.png new file mode 100644 index 00000000..71966d8f Binary files /dev/null and b/resources/contenttweaker/textures/items/black_hole_alloy_ingot.png differ diff --git a/resources/contenttweaker/textures/items/black_hole_alloy_ingot.png.mcmeta b/resources/contenttweaker/textures/items/black_hole_alloy_ingot.png.mcmeta new file mode 100644 index 00000000..e72658ac --- /dev/null +++ b/resources/contenttweaker/textures/items/black_hole_alloy_ingot.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/resources/contenttweaker/textures/items/black_hole_core.png b/resources/contenttweaker/textures/items/black_hole_core.png index bf720663..dd68f50c 100644 Binary files a/resources/contenttweaker/textures/items/black_hole_core.png and b/resources/contenttweaker/textures/items/black_hole_core.png differ diff --git a/resources/contenttweaker/textures/items/black_hole_juice.png b/resources/contenttweaker/textures/items/black_hole_juice.png new file mode 100644 index 00000000..b80ea64c Binary files /dev/null and b/resources/contenttweaker/textures/items/black_hole_juice.png differ diff --git a/resources/contenttweaker/textures/items/blade_of_the_samurai_queen.png b/resources/contenttweaker/textures/items/blade_of_the_samurai_queen.png new file mode 100644 index 00000000..4c44d829 Binary files /dev/null and b/resources/contenttweaker/textures/items/blade_of_the_samurai_queen.png differ diff --git a/resources/contenttweaker/textures/items/bullet_of_the_gun_devil.png b/resources/contenttweaker/textures/items/bullet_of_the_gun_devil.png new file mode 100644 index 00000000..97b77851 Binary files /dev/null and b/resources/contenttweaker/textures/items/bullet_of_the_gun_devil.png differ diff --git a/resources/contenttweaker/textures/items/call_of_the_love.png b/resources/contenttweaker/textures/items/call_of_the_love.png new file mode 100644 index 00000000..249a33d8 Binary files /dev/null and b/resources/contenttweaker/textures/items/call_of_the_love.png differ diff --git a/resources/contenttweaker/textures/items/call_of_the_loved.png b/resources/contenttweaker/textures/items/call_of_the_loved.png new file mode 100644 index 00000000..01aa467f Binary files /dev/null and b/resources/contenttweaker/textures/items/call_of_the_loved.png differ diff --git a/resources/contenttweaker/textures/items/call_of_the_lover.png b/resources/contenttweaker/textures/items/call_of_the_lover.png new file mode 100644 index 00000000..bd385fca Binary files /dev/null and b/resources/contenttweaker/textures/items/call_of_the_lover.png differ diff --git a/resources/contenttweaker/textures/items/call_to_mission.png b/resources/contenttweaker/textures/items/call_to_mission.png new file mode 100644 index 00000000..cb90f35f Binary files /dev/null and b/resources/contenttweaker/textures/items/call_to_mission.png differ diff --git a/resources/contenttweaker/textures/items/charged_signalum.png b/resources/contenttweaker/textures/items/charged_signalum.png new file mode 100644 index 00000000..1083a30f Binary files /dev/null and b/resources/contenttweaker/textures/items/charged_signalum.png differ diff --git a/resources/contenttweaker/textures/items/charm_of_the_falling_tower.png b/resources/contenttweaker/textures/items/charm_of_the_falling_tower.png new file mode 100644 index 00000000..75735160 Binary files /dev/null and b/resources/contenttweaker/textures/items/charm_of_the_falling_tower.png differ diff --git a/resources/contenttweaker/textures/items/cleansed_brightsteel_alloy_plate.png b/resources/contenttweaker/textures/items/cleansed_brightsteel_alloy_plate.png new file mode 100644 index 00000000..53f03883 Binary files /dev/null and b/resources/contenttweaker/textures/items/cleansed_brightsteel_alloy_plate.png differ diff --git a/resources/contenttweaker/textures/items/cleansed_brightsteel_alloy_plate.png.mcmeta b/resources/contenttweaker/textures/items/cleansed_brightsteel_alloy_plate.png.mcmeta new file mode 100644 index 00000000..e72658ac --- /dev/null +++ b/resources/contenttweaker/textures/items/cleansed_brightsteel_alloy_plate.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/resources/contenttweaker/textures/items/cleansed_cinnamon_apple.png b/resources/contenttweaker/textures/items/cleansed_cinnamon_apple.png new file mode 100644 index 00000000..70cb1781 Binary files /dev/null and b/resources/contenttweaker/textures/items/cleansed_cinnamon_apple.png differ diff --git a/resources/contenttweaker/textures/items/clearing_taint.png b/resources/contenttweaker/textures/items/clearing_taint.png new file mode 100644 index 00000000..4e90e2ae Binary files /dev/null and b/resources/contenttweaker/textures/items/clearing_taint.png differ diff --git a/resources/contenttweaker/textures/items/collar_bells.png b/resources/contenttweaker/textures/items/collar_bells.png new file mode 100644 index 00000000..876c13ea Binary files /dev/null and b/resources/contenttweaker/textures/items/collar_bells.png differ diff --git a/resources/contenttweaker/textures/items/cool_walking_stick.png b/resources/contenttweaker/textures/items/cool_walking_stick.png new file mode 100644 index 00000000..f78cea2f Binary files /dev/null and b/resources/contenttweaker/textures/items/cool_walking_stick.png differ diff --git a/resources/contenttweaker/textures/items/core_of_the_mythic_shells.png b/resources/contenttweaker/textures/items/core_of_the_mythic_shells.png new file mode 100644 index 00000000..4db99a35 Binary files /dev/null and b/resources/contenttweaker/textures/items/core_of_the_mythic_shells.png differ diff --git a/resources/contenttweaker/textures/items/core_of_the_mythic_shells.png.mcmeta b/resources/contenttweaker/textures/items/core_of_the_mythic_shells.png.mcmeta new file mode 100644 index 00000000..e72658ac --- /dev/null +++ b/resources/contenttweaker/textures/items/core_of_the_mythic_shells.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/resources/contenttweaker/textures/items/cosmic_pot.png b/resources/contenttweaker/textures/items/cosmic_pot.png new file mode 100644 index 00000000..30291e34 Binary files /dev/null and b/resources/contenttweaker/textures/items/cosmic_pot.png differ diff --git a/resources/contenttweaker/textures/items/cosmic_string.png b/resources/contenttweaker/textures/items/cosmic_string.png new file mode 100644 index 00000000..e8c4dd19 Binary files /dev/null and b/resources/contenttweaker/textures/items/cosmic_string.png differ diff --git a/resources/contenttweaker/textures/items/cosmic_string.png.mcmeta b/resources/contenttweaker/textures/items/cosmic_string.png.mcmeta new file mode 100644 index 00000000..e72658ac --- /dev/null +++ b/resources/contenttweaker/textures/items/cosmic_string.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/resources/contenttweaker/textures/items/cosmic_string_conduit.png b/resources/contenttweaker/textures/items/cosmic_string_conduit.png new file mode 100644 index 00000000..8fd88ef4 Binary files /dev/null and b/resources/contenttweaker/textures/items/cosmic_string_conduit.png differ diff --git a/resources/contenttweaker/textures/items/cosmic_string_conduit.png.mcmeta b/resources/contenttweaker/textures/items/cosmic_string_conduit.png.mcmeta new file mode 100644 index 00000000..e72658ac --- /dev/null +++ b/resources/contenttweaker/textures/items/cosmic_string_conduit.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/resources/contenttweaker/textures/items/cosmic_string_primer.png b/resources/contenttweaker/textures/items/cosmic_string_primer.png new file mode 100644 index 00000000..97cac79b Binary files /dev/null and b/resources/contenttweaker/textures/items/cosmic_string_primer.png differ diff --git a/resources/contenttweaker/textures/items/crystalized_emberstone.png b/resources/contenttweaker/textures/items/crystalized_emberstone.png index 333482cc..af8783d4 100644 Binary files a/resources/contenttweaker/textures/items/crystalized_emberstone.png and b/resources/contenttweaker/textures/items/crystalized_emberstone.png differ diff --git a/resources/contenttweaker/textures/items/crystallized_tungstensteel.png b/resources/contenttweaker/textures/items/crystallized_tungstensteel.png index 58b792f6..6aff001f 100644 Binary files a/resources/contenttweaker/textures/items/crystallized_tungstensteel.png and b/resources/contenttweaker/textures/items/crystallized_tungstensteel.png differ diff --git a/resources/contenttweaker/textures/items/cuendillar_catalyst_1.png b/resources/contenttweaker/textures/items/cuendillar_catalyst_1.png new file mode 100644 index 00000000..8d8cb94b Binary files /dev/null and b/resources/contenttweaker/textures/items/cuendillar_catalyst_1.png differ diff --git a/resources/contenttweaker/textures/items/cuendillar_catalyst_2.png b/resources/contenttweaker/textures/items/cuendillar_catalyst_2.png new file mode 100644 index 00000000..b6b626fa Binary files /dev/null and b/resources/contenttweaker/textures/items/cuendillar_catalyst_2.png differ diff --git a/resources/contenttweaker/textures/items/cuendillar_catalyst_3.png b/resources/contenttweaker/textures/items/cuendillar_catalyst_3.png new file mode 100644 index 00000000..204cea5c Binary files /dev/null and b/resources/contenttweaker/textures/items/cuendillar_catalyst_3.png differ diff --git a/resources/contenttweaker/textures/items/cursed_dragon_egg.png b/resources/contenttweaker/textures/items/cursed_dragon_egg.png new file mode 100644 index 00000000..32a3f26f Binary files /dev/null and b/resources/contenttweaker/textures/items/cursed_dragon_egg.png differ diff --git a/resources/contenttweaker/textures/items/dark_matter_scattering_element.png b/resources/contenttweaker/textures/items/dark_matter_scattering_element.png new file mode 100644 index 00000000..53f772a8 Binary files /dev/null and b/resources/contenttweaker/textures/items/dark_matter_scattering_element.png differ diff --git a/resources/contenttweaker/textures/items/defined_bar.png b/resources/contenttweaker/textures/items/defined_bar.png new file mode 100644 index 00000000..2f3a3169 Binary files /dev/null and b/resources/contenttweaker/textures/items/defined_bar.png differ diff --git a/resources/contenttweaker/textures/items/depleted_apothecary_fissile_alloy.png b/resources/contenttweaker/textures/items/depleted_apothecary_fissile_alloy.png new file mode 100644 index 00000000..70b94091 Binary files /dev/null and b/resources/contenttweaker/textures/items/depleted_apothecary_fissile_alloy.png differ diff --git a/resources/contenttweaker/textures/items/depleted_arcane_fissile_alloy.png b/resources/contenttweaker/textures/items/depleted_arcane_fissile_alloy.png new file mode 100644 index 00000000..efc7bc34 Binary files /dev/null and b/resources/contenttweaker/textures/items/depleted_arcane_fissile_alloy.png differ diff --git a/resources/contenttweaker/textures/items/depleted_innerved_fissile_alloy.png b/resources/contenttweaker/textures/items/depleted_innerved_fissile_alloy.png new file mode 100644 index 00000000..300f9e30 Binary files /dev/null and b/resources/contenttweaker/textures/items/depleted_innerved_fissile_alloy.png differ diff --git a/resources/contenttweaker/textures/items/depleted_radiant_fissile_alloy.png b/resources/contenttweaker/textures/items/depleted_radiant_fissile_alloy.png new file mode 100644 index 00000000..3d63e161 Binary files /dev/null and b/resources/contenttweaker/textures/items/depleted_radiant_fissile_alloy.png differ diff --git a/resources/contenttweaker/textures/items/depleted_silvan_fissile_alloy.png b/resources/contenttweaker/textures/items/depleted_silvan_fissile_alloy.png new file mode 100644 index 00000000..d5266367 Binary files /dev/null and b/resources/contenttweaker/textures/items/depleted_silvan_fissile_alloy.png differ diff --git a/resources/contenttweaker/textures/items/dimensionally_ascended_garnet.png b/resources/contenttweaker/textures/items/dimensionally_ascended_garnet.png new file mode 100644 index 00000000..f75bc10f Binary files /dev/null and b/resources/contenttweaker/textures/items/dimensionally_ascended_garnet.png differ diff --git a/resources/contenttweaker/textures/items/drawn_black_hole_alloy_clump.png b/resources/contenttweaker/textures/items/drawn_black_hole_alloy_clump.png new file mode 100644 index 00000000..ea8ba307 Binary files /dev/null and b/resources/contenttweaker/textures/items/drawn_black_hole_alloy_clump.png differ diff --git a/resources/contenttweaker/textures/items/drawn_black_hole_alloy_clump.png.mcmeta b/resources/contenttweaker/textures/items/drawn_black_hole_alloy_clump.png.mcmeta new file mode 100644 index 00000000..e72658ac --- /dev/null +++ b/resources/contenttweaker/textures/items/drawn_black_hole_alloy_clump.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/resources/contenttweaker/textures/items/dust_of_infinite_wishes.png b/resources/contenttweaker/textures/items/dust_of_infinite_wishes.png new file mode 100644 index 00000000..9923d175 Binary files /dev/null and b/resources/contenttweaker/textures/items/dust_of_infinite_wishes.png differ diff --git a/resources/contenttweaker/textures/items/dynatos_crystal.png b/resources/contenttweaker/textures/items/dynatos_crystal.png index 776c21f9..bf04a8c4 100644 Binary files a/resources/contenttweaker/textures/items/dynatos_crystal.png and b/resources/contenttweaker/textures/items/dynatos_crystal.png differ diff --git a/resources/contenttweaker/textures/items/echo_warren_bar.png b/resources/contenttweaker/textures/items/echo_warren_bar.png new file mode 100644 index 00000000..1ea7af8f Binary files /dev/null and b/resources/contenttweaker/textures/items/echo_warren_bar.png differ diff --git a/resources/contenttweaker/textures/items/eleint_stone.png b/resources/contenttweaker/textures/items/eleint_stone.png new file mode 100644 index 00000000..f0492510 Binary files /dev/null and b/resources/contenttweaker/textures/items/eleint_stone.png differ diff --git a/resources/contenttweaker/textures/items/embodiment_of_balance.png b/resources/contenttweaker/textures/items/embodiment_of_balance.png new file mode 100644 index 00000000..3b97855f Binary files /dev/null and b/resources/contenttweaker/textures/items/embodiment_of_balance.png differ diff --git a/resources/contenttweaker/textures/items/embodiment_of_glory.png b/resources/contenttweaker/textures/items/embodiment_of_glory.png new file mode 100644 index 00000000..9e00cb8b Binary files /dev/null and b/resources/contenttweaker/textures/items/embodiment_of_glory.png differ diff --git a/resources/contenttweaker/textures/items/embodiment_of_hope.png b/resources/contenttweaker/textures/items/embodiment_of_hope.png new file mode 100644 index 00000000..0c79ab45 Binary files /dev/null and b/resources/contenttweaker/textures/items/embodiment_of_hope.png differ diff --git a/resources/contenttweaker/textures/items/embodiment_of_knowledge.png b/resources/contenttweaker/textures/items/embodiment_of_knowledge.png new file mode 100644 index 00000000..f88b4794 Binary files /dev/null and b/resources/contenttweaker/textures/items/embodiment_of_knowledge.png differ diff --git a/resources/contenttweaker/textures/items/emc_crown.png b/resources/contenttweaker/textures/items/emc_crown.png new file mode 100644 index 00000000..954b53d3 Binary files /dev/null and b/resources/contenttweaker/textures/items/emc_crown.png differ diff --git a/resources/contenttweaker/textures/items/everburning_dust.png b/resources/contenttweaker/textures/items/everburning_dust.png new file mode 100644 index 00000000..e6db9733 Binary files /dev/null and b/resources/contenttweaker/textures/items/everburning_dust.png differ diff --git a/resources/contenttweaker/textures/items/everburning_plating.png b/resources/contenttweaker/textures/items/everburning_plating.png new file mode 100644 index 00000000..142345dc Binary files /dev/null and b/resources/contenttweaker/textures/items/everburning_plating.png differ diff --git a/resources/contenttweaker/textures/items/everburning_recursion_fragment.png b/resources/contenttweaker/textures/items/everburning_recursion_fragment.png new file mode 100644 index 00000000..bfc81a8d Binary files /dev/null and b/resources/contenttweaker/textures/items/everburning_recursion_fragment.png differ diff --git a/resources/contenttweaker/textures/items/everlasting_fusor.png b/resources/contenttweaker/textures/items/everlasting_fusor.png index 25f530cc..33656432 100644 Binary files a/resources/contenttweaker/textures/items/everlasting_fusor.png and b/resources/contenttweaker/textures/items/everlasting_fusor.png differ diff --git a/resources/contenttweaker/textures/items/experience_configurator.png b/resources/contenttweaker/textures/items/experience_configurator.png new file mode 100644 index 00000000..1f19b3ad Binary files /dev/null and b/resources/contenttweaker/textures/items/experience_configurator.png differ diff --git a/resources/contenttweaker/textures/items/eye_of_harmony_power_unit.png b/resources/contenttweaker/textures/items/eye_of_harmony_power_unit.png new file mode 100644 index 00000000..62f7bbe3 Binary files /dev/null and b/resources/contenttweaker/textures/items/eye_of_harmony_power_unit.png differ diff --git a/resources/contenttweaker/textures/items/eye_of_harmony_power_unit.png.mcmeta b/resources/contenttweaker/textures/items/eye_of_harmony_power_unit.png.mcmeta new file mode 100644 index 00000000..e72658ac --- /dev/null +++ b/resources/contenttweaker/textures/items/eye_of_harmony_power_unit.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/resources/contenttweaker/textures/items/fiery_recursion_fragment.png b/resources/contenttweaker/textures/items/fiery_recursion_fragment.png new file mode 100644 index 00000000..79bf0bfe Binary files /dev/null and b/resources/contenttweaker/textures/items/fiery_recursion_fragment.png differ diff --git a/resources/contenttweaker/textures/items/finis.png b/resources/contenttweaker/textures/items/finis.png new file mode 100644 index 00000000..96f40abf Binary files /dev/null and b/resources/contenttweaker/textures/items/finis.png differ diff --git a/resources/contenttweaker/textures/items/fractal_metal_clump.png b/resources/contenttweaker/textures/items/fractal_metal_clump.png new file mode 100644 index 00000000..4a6e95bc Binary files /dev/null and b/resources/contenttweaker/textures/items/fractal_metal_clump.png differ diff --git a/resources/contenttweaker/textures/items/fractal_metal_plate.png b/resources/contenttweaker/textures/items/fractal_metal_plate.png new file mode 100644 index 00000000..4f0f7ad4 Binary files /dev/null and b/resources/contenttweaker/textures/items/fractal_metal_plate.png differ diff --git a/resources/contenttweaker/textures/items/fractal_stone_dust.png b/resources/contenttweaker/textures/items/fractal_stone_dust.png new file mode 100644 index 00000000..e75566aa Binary files /dev/null and b/resources/contenttweaker/textures/items/fractal_stone_dust.png differ diff --git a/resources/contenttweaker/textures/items/fractallite_focus_lens.png b/resources/contenttweaker/textures/items/fractallite_focus_lens.png new file mode 100644 index 00000000..5c2a7f45 Binary files /dev/null and b/resources/contenttweaker/textures/items/fractallite_focus_lens.png differ diff --git a/resources/contenttweaker/textures/items/fractallite_quantum.png b/resources/contenttweaker/textures/items/fractallite_quantum.png new file mode 100644 index 00000000..ae1f6c72 Binary files /dev/null and b/resources/contenttweaker/textures/items/fractallite_quantum.png differ diff --git a/resources/contenttweaker/textures/items/fractallite_quantum.png.mcmeta b/resources/contenttweaker/textures/items/fractallite_quantum.png.mcmeta new file mode 100644 index 00000000..e72658ac --- /dev/null +++ b/resources/contenttweaker/textures/items/fractallite_quantum.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/resources/contenttweaker/textures/items/fractallite_taint.png b/resources/contenttweaker/textures/items/fractallite_taint.png new file mode 100644 index 00000000..a783551e Binary files /dev/null and b/resources/contenttweaker/textures/items/fractallite_taint.png differ diff --git a/resources/contenttweaker/textures/items/freed_sky_stone_dust.png b/resources/contenttweaker/textures/items/freed_sky_stone_dust.png new file mode 100644 index 00000000..abf1c123 Binary files /dev/null and b/resources/contenttweaker/textures/items/freed_sky_stone_dust.png differ diff --git a/resources/contenttweaker/textures/items/galactic_core.png b/resources/contenttweaker/textures/items/galactic_core.png new file mode 100644 index 00000000..53900571 Binary files /dev/null and b/resources/contenttweaker/textures/items/galactic_core.png differ diff --git a/resources/contenttweaker/textures/items/galactic_power_unit.png b/resources/contenttweaker/textures/items/galactic_power_unit.png new file mode 100644 index 00000000..5dfae089 Binary files /dev/null and b/resources/contenttweaker/textures/items/galactic_power_unit.png differ diff --git a/resources/contenttweaker/textures/items/galaxy_superconductor.png b/resources/contenttweaker/textures/items/galaxy_superconductor.png new file mode 100644 index 00000000..d41515e1 Binary files /dev/null and b/resources/contenttweaker/textures/items/galaxy_superconductor.png differ diff --git a/resources/contenttweaker/textures/items/gem_of_dimensional_ascension.png b/resources/contenttweaker/textures/items/gem_of_dimensional_ascension.png new file mode 100644 index 00000000..c8c4da86 Binary files /dev/null and b/resources/contenttweaker/textures/items/gem_of_dimensional_ascension.png differ diff --git a/resources/contenttweaker/textures/items/gem_of_pure_taint.png b/resources/contenttweaker/textures/items/gem_of_pure_taint.png new file mode 100644 index 00000000..b6c361a1 Binary files /dev/null and b/resources/contenttweaker/textures/items/gem_of_pure_taint.png differ diff --git a/resources/contenttweaker/textures/items/ghost_of_annoyance_callstone.png b/resources/contenttweaker/textures/items/ghost_of_annoyance_callstone.png new file mode 100644 index 00000000..b535ba40 Binary files /dev/null and b/resources/contenttweaker/textures/items/ghost_of_annoyance_callstone.png differ diff --git a/resources/contenttweaker/textures/items/gravitational_time_crystal.png b/resources/contenttweaker/textures/items/gravitational_time_crystal.png new file mode 100644 index 00000000..d8ad7637 Binary files /dev/null and b/resources/contenttweaker/textures/items/gravitational_time_crystal.png differ diff --git a/resources/contenttweaker/textures/items/gravitational_time_crystal.png.mcmeta b/resources/contenttweaker/textures/items/gravitational_time_crystal.png.mcmeta new file mode 100644 index 00000000..e72658ac --- /dev/null +++ b/resources/contenttweaker/textures/items/gravitational_time_crystal.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/resources/contenttweaker/textures/items/guardians_of_shadesmar_callstone.png b/resources/contenttweaker/textures/items/guardians_of_shadesmar_callstone.png new file mode 100644 index 00000000..ce3dee9c Binary files /dev/null and b/resources/contenttweaker/textures/items/guardians_of_shadesmar_callstone.png differ diff --git a/resources/contenttweaker/textures/items/gun_devil_confrontation_callstone.png b/resources/contenttweaker/textures/items/gun_devil_confrontation_callstone.png new file mode 100644 index 00000000..d778cc3a Binary files /dev/null and b/resources/contenttweaker/textures/items/gun_devil_confrontation_callstone.png differ diff --git a/resources/contenttweaker/textures/items/gun_devil_limb.png b/resources/contenttweaker/textures/items/gun_devil_limb.png new file mode 100644 index 00000000..ea32d75c Binary files /dev/null and b/resources/contenttweaker/textures/items/gun_devil_limb.png differ diff --git a/resources/contenttweaker/textures/items/hiddenpowercallstone_loot.png b/resources/contenttweaker/textures/items/hiddenpowercallstone_loot.png new file mode 100644 index 00000000..cc624fb5 Binary files /dev/null and b/resources/contenttweaker/textures/items/hiddenpowercallstone_loot.png differ diff --git a/resources/contenttweaker/textures/items/horrible_unedited_fanfiction.png b/resources/contenttweaker/textures/items/horrible_unedited_fanfiction.png new file mode 100644 index 00000000..e8f42374 Binary files /dev/null and b/resources/contenttweaker/textures/items/horrible_unedited_fanfiction.png differ diff --git a/resources/contenttweaker/textures/items/hypercharged_redstone.png b/resources/contenttweaker/textures/items/hypercharged_redstone.png new file mode 100644 index 00000000..df2bda0d Binary files /dev/null and b/resources/contenttweaker/textures/items/hypercharged_redstone.png differ diff --git a/resources/contenttweaker/textures/items/hypercharged_wool.png b/resources/contenttweaker/textures/items/hypercharged_wool.png new file mode 100644 index 00000000..f4b8fe3f Binary files /dev/null and b/resources/contenttweaker/textures/items/hypercharged_wool.png differ diff --git a/resources/contenttweaker/textures/items/infinite_processor.png b/resources/contenttweaker/textures/items/infinite_processor.png new file mode 100644 index 00000000..211950e4 Binary files /dev/null and b/resources/contenttweaker/textures/items/infinite_processor.png differ diff --git a/resources/contenttweaker/textures/items/infinite_processor.png.mcmeta b/resources/contenttweaker/textures/items/infinite_processor.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/infinite_processor.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/infinite_tainted_plate.png b/resources/contenttweaker/textures/items/infinite_tainted_plate.png new file mode 100644 index 00000000..b8fb4bc8 Binary files /dev/null and b/resources/contenttweaker/textures/items/infinite_tainted_plate.png differ diff --git a/resources/contenttweaker/textures/items/ingot_of_infinite_wishes.png b/resources/contenttweaker/textures/items/ingot_of_infinite_wishes.png new file mode 100644 index 00000000..58ab34af Binary files /dev/null and b/resources/contenttweaker/textures/items/ingot_of_infinite_wishes.png differ diff --git a/resources/contenttweaker/textures/items/ingot_of_infinite_wishes.png.mcmeta b/resources/contenttweaker/textures/items/ingot_of_infinite_wishes.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/ingot_of_infinite_wishes.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/innerved_fissile_alloy.png b/resources/contenttweaker/textures/items/innerved_fissile_alloy.png new file mode 100644 index 00000000..d2e97956 Binary files /dev/null and b/resources/contenttweaker/textures/items/innerved_fissile_alloy.png differ diff --git a/resources/contenttweaker/textures/items/innerved_fissile_alloy.png.mcmeta b/resources/contenttweaker/textures/items/innerved_fissile_alloy.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/innerved_fissile_alloy.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/innerved_fissile_dust.png b/resources/contenttweaker/textures/items/innerved_fissile_dust.png new file mode 100644 index 00000000..62abacf3 Binary files /dev/null and b/resources/contenttweaker/textures/items/innerved_fissile_dust.png differ diff --git a/resources/contenttweaker/textures/items/key_of_restored_balance.png b/resources/contenttweaker/textures/items/key_of_restored_balance.png new file mode 100644 index 00000000..67304ea2 Binary files /dev/null and b/resources/contenttweaker/textures/items/key_of_restored_balance.png differ diff --git a/resources/contenttweaker/textures/items/linked_apple_slice.png b/resources/contenttweaker/textures/items/linked_apple_slice.png new file mode 100644 index 00000000..d207ee00 Binary files /dev/null and b/resources/contenttweaker/textures/items/linked_apple_slice.png differ diff --git a/resources/contenttweaker/textures/items/lively_tree_callstone.png b/resources/contenttweaker/textures/items/lively_tree_callstone.png new file mode 100644 index 00000000..7deca06c Binary files /dev/null and b/resources/contenttweaker/textures/items/lively_tree_callstone.png differ diff --git a/resources/contenttweaker/textures/items/living_shard_of_shadesmar.png b/resources/contenttweaker/textures/items/living_shard_of_shadesmar.png new file mode 100644 index 00000000..484aa7d1 Binary files /dev/null and b/resources/contenttweaker/textures/items/living_shard_of_shadesmar.png differ diff --git a/resources/contenttweaker/textures/items/lost_cities_worldgen.png b/resources/contenttweaker/textures/items/lost_cities_worldgen.png new file mode 100644 index 00000000..8a7d4e76 Binary files /dev/null and b/resources/contenttweaker/textures/items/lost_cities_worldgen.png differ diff --git a/resources/contenttweaker/textures/items/magazine_of_the_gun_devil.png b/resources/contenttweaker/textures/items/magazine_of_the_gun_devil.png new file mode 100644 index 00000000..71d07e32 Binary files /dev/null and b/resources/contenttweaker/textures/items/magazine_of_the_gun_devil.png differ diff --git a/resources/contenttweaker/textures/items/massive_boomboom.png b/resources/contenttweaker/textures/items/massive_boomboom.png new file mode 100644 index 00000000..dcbc23c9 Binary files /dev/null and b/resources/contenttweaker/textures/items/massive_boomboom.png differ diff --git a/resources/contenttweaker/textures/items/master_spell_cognitio.png b/resources/contenttweaker/textures/items/master_spell_cognitio.png new file mode 100644 index 00000000..5e49592c Binary files /dev/null and b/resources/contenttweaker/textures/items/master_spell_cognitio.png differ diff --git a/resources/contenttweaker/textures/items/master_spell_infernum.png b/resources/contenttweaker/textures/items/master_spell_infernum.png new file mode 100644 index 00000000..689166f3 Binary files /dev/null and b/resources/contenttweaker/textures/items/master_spell_infernum.png differ diff --git a/resources/contenttweaker/textures/items/master_spell_sonus.png b/resources/contenttweaker/textures/items/master_spell_sonus.png new file mode 100644 index 00000000..32015a68 Binary files /dev/null and b/resources/contenttweaker/textures/items/master_spell_sonus.png differ diff --git a/resources/contenttweaker/textures/items/meatball_attuned_crystal.png b/resources/contenttweaker/textures/items/meatball_attuned_crystal.png index a76cb962..7cdf016a 100644 Binary files a/resources/contenttweaker/textures/items/meatball_attuned_crystal.png and b/resources/contenttweaker/textures/items/meatball_attuned_crystal.png differ diff --git a/resources/contenttweaker/textures/items/mission_of_undeath_callstone.png b/resources/contenttweaker/textures/items/mission_of_undeath_callstone.png new file mode 100644 index 00000000..8203aff0 Binary files /dev/null and b/resources/contenttweaker/textures/items/mission_of_undeath_callstone.png differ diff --git a/resources/contenttweaker/textures/items/mixed_metal_shard.png b/resources/contenttweaker/textures/items/mixed_metal_shard.png new file mode 100644 index 00000000..82f91bb9 Binary files /dev/null and b/resources/contenttweaker/textures/items/mixed_metal_shard.png differ diff --git a/resources/contenttweaker/textures/items/multiblock_input_swapping.png b/resources/contenttweaker/textures/items/multiblock_input_swapping.png new file mode 100644 index 00000000..b7c71ef7 Binary files /dev/null and b/resources/contenttweaker/textures/items/multiblock_input_swapping.png differ diff --git a/resources/contenttweaker/textures/items/neutronium_pearl.png b/resources/contenttweaker/textures/items/neutronium_pearl.png new file mode 100644 index 00000000..249a49bd Binary files /dev/null and b/resources/contenttweaker/textures/items/neutronium_pearl.png differ diff --git a/resources/contenttweaker/textures/items/nightmare_of_annoyance.png b/resources/contenttweaker/textures/items/nightmare_of_annoyance.png new file mode 100644 index 00000000..c72954b0 Binary files /dev/null and b/resources/contenttweaker/textures/items/nightmare_of_annoyance.png differ diff --git a/resources/contenttweaker/textures/items/null_pointer.png b/resources/contenttweaker/textures/items/null_pointer.png new file mode 100644 index 00000000..a1fd2509 Binary files /dev/null and b/resources/contenttweaker/textures/items/null_pointer.png differ diff --git a/resources/contenttweaker/textures/items/oath_of_the_lord_of_gluttony.png b/resources/contenttweaker/textures/items/oath_of_the_lord_of_gluttony.png new file mode 100644 index 00000000..72020010 Binary files /dev/null and b/resources/contenttweaker/textures/items/oath_of_the_lord_of_gluttony.png differ diff --git a/resources/contenttweaker/textures/items/oath_of_the_seven_undead_lords.png b/resources/contenttweaker/textures/items/oath_of_the_seven_undead_lords.png new file mode 100644 index 00000000..3f98c953 Binary files /dev/null and b/resources/contenttweaker/textures/items/oath_of_the_seven_undead_lords.png differ diff --git a/resources/contenttweaker/textures/items/offer_of_restored_balance.png b/resources/contenttweaker/textures/items/offer_of_restored_balance.png new file mode 100644 index 00000000..434cfadf Binary files /dev/null and b/resources/contenttweaker/textures/items/offer_of_restored_balance.png differ diff --git a/resources/contenttweaker/textures/items/opalescent_matter.png b/resources/contenttweaker/textures/items/opalescent_matter.png new file mode 100644 index 00000000..2273caab Binary files /dev/null and b/resources/contenttweaker/textures/items/opalescent_matter.png differ diff --git a/resources/contenttweaker/textures/items/p0rtals_redish_white_hat.png b/resources/contenttweaker/textures/items/p0rtals_redish_white_hat.png new file mode 100644 index 00000000..9d3b0ec9 Binary files /dev/null and b/resources/contenttweaker/textures/items/p0rtals_redish_white_hat.png differ diff --git a/resources/contenttweaker/textures/items/pack_supporter_token.png b/resources/contenttweaker/textures/items/pack_supporter_token.png new file mode 100644 index 00000000..e47e94f8 Binary files /dev/null and b/resources/contenttweaker/textures/items/pack_supporter_token.png differ diff --git a/resources/contenttweaker/textures/items/plate_clump_fractal.png b/resources/contenttweaker/textures/items/plate_clump_fractal.png new file mode 100644 index 00000000..c81cc09d Binary files /dev/null and b/resources/contenttweaker/textures/items/plate_clump_fractal.png differ diff --git a/resources/contenttweaker/textures/items/plate_clump_recursive.png b/resources/contenttweaker/textures/items/plate_clump_recursive.png new file mode 100644 index 00000000..d64e8859 Binary files /dev/null and b/resources/contenttweaker/textures/items/plate_clump_recursive.png differ diff --git a/resources/contenttweaker/textures/items/power_wrought_brightsteel_alloy_plate.png b/resources/contenttweaker/textures/items/power_wrought_brightsteel_alloy_plate.png new file mode 100644 index 00000000..c22a6c8e Binary files /dev/null and b/resources/contenttweaker/textures/items/power_wrought_brightsteel_alloy_plate.png differ diff --git a/resources/contenttweaker/textures/items/prayer_to_the_trinity_of_love.png b/resources/contenttweaker/textures/items/prayer_to_the_trinity_of_love.png new file mode 100644 index 00000000..29b5e245 Binary files /dev/null and b/resources/contenttweaker/textures/items/prayer_to_the_trinity_of_love.png differ diff --git a/resources/contenttweaker/textures/items/pulsar_core.png b/resources/contenttweaker/textures/items/pulsar_core.png index e567de9a..1cfb9dad 100644 Binary files a/resources/contenttweaker/textures/items/pulsar_core.png and b/resources/contenttweaker/textures/items/pulsar_core.png differ diff --git a/resources/contenttweaker/textures/items/pure_twilight_matter.png b/resources/contenttweaker/textures/items/pure_twilight_matter.png new file mode 100644 index 00000000..8d9af359 Binary files /dev/null and b/resources/contenttweaker/textures/items/pure_twilight_matter.png differ diff --git a/resources/contenttweaker/textures/items/puzzle_solution_cherubim.png b/resources/contenttweaker/textures/items/puzzle_solution_cherubim.png new file mode 100644 index 00000000..004d56fb Binary files /dev/null and b/resources/contenttweaker/textures/items/puzzle_solution_cherubim.png differ diff --git a/resources/contenttweaker/textures/items/puzzle_solution_dimensionalascension.png b/resources/contenttweaker/textures/items/puzzle_solution_dimensionalascension.png new file mode 100644 index 00000000..2bedea9d Binary files /dev/null and b/resources/contenttweaker/textures/items/puzzle_solution_dimensionalascension.png differ diff --git a/resources/contenttweaker/textures/items/puzzle_solution_freedskystone.png b/resources/contenttweaker/textures/items/puzzle_solution_freedskystone.png new file mode 100644 index 00000000..0cd4eae8 Binary files /dev/null and b/resources/contenttweaker/textures/items/puzzle_solution_freedskystone.png differ diff --git a/resources/contenttweaker/textures/items/puzzle_solution_undeadsoil.png b/resources/contenttweaker/textures/items/puzzle_solution_undeadsoil.png new file mode 100644 index 00000000..efe01321 Binary files /dev/null and b/resources/contenttweaker/textures/items/puzzle_solution_undeadsoil.png differ diff --git a/resources/contenttweaker/textures/items/puzzle_solution_vowtodeath.png b/resources/contenttweaker/textures/items/puzzle_solution_vowtodeath.png new file mode 100644 index 00000000..4b3cd4f8 Binary files /dev/null and b/resources/contenttweaker/textures/items/puzzle_solution_vowtodeath.png differ diff --git a/resources/contenttweaker/textures/items/quasar_charged_dust.png b/resources/contenttweaker/textures/items/quasar_charged_dust.png new file mode 100644 index 00000000..832164f4 Binary files /dev/null and b/resources/contenttweaker/textures/items/quasar_charged_dust.png differ diff --git a/resources/contenttweaker/textures/items/quasar_charged_dust.png.mcmeta b/resources/contenttweaker/textures/items/quasar_charged_dust.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/quasar_charged_dust.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/quasar_charged_gem.png b/resources/contenttweaker/textures/items/quasar_charged_gem.png new file mode 100644 index 00000000..ebfd8715 Binary files /dev/null and b/resources/contenttweaker/textures/items/quasar_charged_gem.png differ diff --git a/resources/contenttweaker/textures/items/quasar_core.png b/resources/contenttweaker/textures/items/quasar_core.png new file mode 100644 index 00000000..23713194 Binary files /dev/null and b/resources/contenttweaker/textures/items/quasar_core.png differ diff --git a/resources/contenttweaker/textures/items/quasar_core.png.mcmeta b/resources/contenttweaker/textures/items/quasar_core.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/quasar_core.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/quenched_black_hole_alloy_clump.png b/resources/contenttweaker/textures/items/quenched_black_hole_alloy_clump.png new file mode 100644 index 00000000..599ac9d0 Binary files /dev/null and b/resources/contenttweaker/textures/items/quenched_black_hole_alloy_clump.png differ diff --git a/resources/contenttweaker/textures/items/quenched_black_hole_alloy_clump.png.mcmeta b/resources/contenttweaker/textures/items/quenched_black_hole_alloy_clump.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/quenched_black_hole_alloy_clump.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/radiant_fissile_alloy.png b/resources/contenttweaker/textures/items/radiant_fissile_alloy.png new file mode 100644 index 00000000..e8fa8ae7 Binary files /dev/null and b/resources/contenttweaker/textures/items/radiant_fissile_alloy.png differ diff --git a/resources/contenttweaker/textures/items/radiant_fissile_alloy.png.mcmeta b/resources/contenttweaker/textures/items/radiant_fissile_alloy.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/radiant_fissile_alloy.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/radiant_fissile_dust.png b/resources/contenttweaker/textures/items/radiant_fissile_dust.png new file mode 100644 index 00000000..b4f368bf Binary files /dev/null and b/resources/contenttweaker/textures/items/radiant_fissile_dust.png differ diff --git a/resources/contenttweaker/textures/items/reality_pebble.png b/resources/contenttweaker/textures/items/reality_pebble.png new file mode 100644 index 00000000..4517ca4c Binary files /dev/null and b/resources/contenttweaker/textures/items/reality_pebble.png differ diff --git a/resources/contenttweaker/textures/items/recursion_of_dimensional_ascension.png b/resources/contenttweaker/textures/items/recursion_of_dimensional_ascension.png new file mode 100644 index 00000000..03c7e9dc Binary files /dev/null and b/resources/contenttweaker/textures/items/recursion_of_dimensional_ascension.png differ diff --git a/resources/contenttweaker/textures/items/recursion_of_gluttony.png b/resources/contenttweaker/textures/items/recursion_of_gluttony.png new file mode 100644 index 00000000..5f2051c4 Binary files /dev/null and b/resources/contenttweaker/textures/items/recursion_of_gluttony.png differ diff --git a/resources/contenttweaker/textures/items/recursion_of_gluttony.png.mcmeta b/resources/contenttweaker/textures/items/recursion_of_gluttony.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/recursion_of_gluttony.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/recursion_of_taint.png b/resources/contenttweaker/textures/items/recursion_of_taint.png new file mode 100644 index 00000000..cde65957 Binary files /dev/null and b/resources/contenttweaker/textures/items/recursion_of_taint.png differ diff --git a/resources/contenttweaker/textures/items/recursion_of_the_love.png b/resources/contenttweaker/textures/items/recursion_of_the_love.png new file mode 100644 index 00000000..dc5fe96e Binary files /dev/null and b/resources/contenttweaker/textures/items/recursion_of_the_love.png differ diff --git a/resources/contenttweaker/textures/items/recursion_of_the_loved.png b/resources/contenttweaker/textures/items/recursion_of_the_loved.png new file mode 100644 index 00000000..a015e960 Binary files /dev/null and b/resources/contenttweaker/textures/items/recursion_of_the_loved.png differ diff --git a/resources/contenttweaker/textures/items/recursion_of_the_lover.png b/resources/contenttweaker/textures/items/recursion_of_the_lover.png new file mode 100644 index 00000000..2628a134 Binary files /dev/null and b/resources/contenttweaker/textures/items/recursion_of_the_lover.png differ diff --git a/resources/contenttweaker/textures/items/recursive_iced_coffee_pot.png b/resources/contenttweaker/textures/items/recursive_iced_coffee_pot.png new file mode 100644 index 00000000..c84b7835 Binary files /dev/null and b/resources/contenttweaker/textures/items/recursive_iced_coffee_pot.png differ diff --git a/resources/contenttweaker/textures/items/recursive_quantum.png b/resources/contenttweaker/textures/items/recursive_quantum.png new file mode 100644 index 00000000..bf256390 Binary files /dev/null and b/resources/contenttweaker/textures/items/recursive_quantum.png differ diff --git a/resources/contenttweaker/textures/items/recursive_quantum.png.mcmeta b/resources/contenttweaker/textures/items/recursive_quantum.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/recursive_quantum.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/respect_of_death.png b/resources/contenttweaker/textures/items/respect_of_death.png new file mode 100644 index 00000000..84126279 Binary files /dev/null and b/resources/contenttweaker/textures/items/respect_of_death.png differ diff --git a/resources/contenttweaker/textures/items/respect_of_the_lord_of_envy.png b/resources/contenttweaker/textures/items/respect_of_the_lord_of_envy.png new file mode 100644 index 00000000..2940bf4e Binary files /dev/null and b/resources/contenttweaker/textures/items/respect_of_the_lord_of_envy.png differ diff --git a/resources/contenttweaker/textures/items/respect_of_the_lord_of_gluttony.png b/resources/contenttweaker/textures/items/respect_of_the_lord_of_gluttony.png new file mode 100644 index 00000000..72cb2d80 Binary files /dev/null and b/resources/contenttweaker/textures/items/respect_of_the_lord_of_gluttony.png differ diff --git a/resources/contenttweaker/textures/items/respect_of_the_lord_of_greed.png b/resources/contenttweaker/textures/items/respect_of_the_lord_of_greed.png new file mode 100644 index 00000000..701bf406 Binary files /dev/null and b/resources/contenttweaker/textures/items/respect_of_the_lord_of_greed.png differ diff --git a/resources/contenttweaker/textures/items/respect_of_the_lord_of_lust.png b/resources/contenttweaker/textures/items/respect_of_the_lord_of_lust.png new file mode 100644 index 00000000..e45e1e97 Binary files /dev/null and b/resources/contenttweaker/textures/items/respect_of_the_lord_of_lust.png differ diff --git a/resources/contenttweaker/textures/items/respect_of_the_lord_of_pride.png b/resources/contenttweaker/textures/items/respect_of_the_lord_of_pride.png new file mode 100644 index 00000000..742232fc Binary files /dev/null and b/resources/contenttweaker/textures/items/respect_of_the_lord_of_pride.png differ diff --git a/resources/contenttweaker/textures/items/respect_of_the_lord_of_sloth.png b/resources/contenttweaker/textures/items/respect_of_the_lord_of_sloth.png new file mode 100644 index 00000000..001bd792 Binary files /dev/null and b/resources/contenttweaker/textures/items/respect_of_the_lord_of_sloth.png differ diff --git a/resources/contenttweaker/textures/items/respect_of_the_lord_of_wrath.png b/resources/contenttweaker/textures/items/respect_of_the_lord_of_wrath.png new file mode 100644 index 00000000..37eb8aaa Binary files /dev/null and b/resources/contenttweaker/textures/items/respect_of_the_lord_of_wrath.png differ diff --git a/resources/contenttweaker/textures/items/restless_steel_ingot.png.mcmeta b/resources/contenttweaker/textures/items/restless_steel_ingot.png.mcmeta index 5d48f130..d1cd0799 100644 --- a/resources/contenttweaker/textures/items/restless_steel_ingot.png.mcmeta +++ b/resources/contenttweaker/textures/items/restless_steel_ingot.png.mcmeta @@ -1,6 +1,5 @@ { - "animation": { - "frametime": 2, - "frames": [ 0, 0, 1, 0, 1, 2, 1, 0, 1, 2, 3, 2, 3, 4, 3, 5, 3, 2, 1 ] - } -} \ No newline at end of file + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/rune_of_freedom.png b/resources/contenttweaker/textures/items/rune_of_freedom.png new file mode 100644 index 00000000..207cc830 Binary files /dev/null and b/resources/contenttweaker/textures/items/rune_of_freedom.png differ diff --git a/resources/contenttweaker/textures/items/runes_of_the_love.png b/resources/contenttweaker/textures/items/runes_of_the_love.png new file mode 100644 index 00000000..b7ebb99b Binary files /dev/null and b/resources/contenttweaker/textures/items/runes_of_the_love.png differ diff --git a/resources/contenttweaker/textures/items/runes_of_the_loved.png b/resources/contenttweaker/textures/items/runes_of_the_loved.png new file mode 100644 index 00000000..c06304b3 Binary files /dev/null and b/resources/contenttweaker/textures/items/runes_of_the_loved.png differ diff --git a/resources/contenttweaker/textures/items/runes_of_the_lover.png b/resources/contenttweaker/textures/items/runes_of_the_lover.png new file mode 100644 index 00000000..6d25f9c1 Binary files /dev/null and b/resources/contenttweaker/textures/items/runes_of_the_lover.png differ diff --git a/resources/contenttweaker/textures/items/salt_of_knowledge.png b/resources/contenttweaker/textures/items/salt_of_knowledge.png new file mode 100644 index 00000000..a407d9d0 Binary files /dev/null and b/resources/contenttweaker/textures/items/salt_of_knowledge.png differ diff --git a/resources/contenttweaker/textures/items/sashimi_of_the_gate_of_darkness.png b/resources/contenttweaker/textures/items/sashimi_of_the_gate_of_darkness.png new file mode 100644 index 00000000..9ccb667a Binary files /dev/null and b/resources/contenttweaker/textures/items/sashimi_of_the_gate_of_darkness.png differ diff --git a/resources/contenttweaker/textures/items/seeker_stone.png b/resources/contenttweaker/textures/items/seeker_stone.png new file mode 100644 index 00000000..6e308bdf Binary files /dev/null and b/resources/contenttweaker/textures/items/seeker_stone.png differ diff --git a/resources/contenttweaker/textures/items/shard_of_the_cosmos.png b/resources/contenttweaker/textures/items/shard_of_the_cosmos.png new file mode 100644 index 00000000..70f3461c Binary files /dev/null and b/resources/contenttweaker/textures/items/shard_of_the_cosmos.png differ diff --git a/resources/contenttweaker/textures/items/shield_of_the_arbiter.png b/resources/contenttweaker/textures/items/shield_of_the_arbiter.png new file mode 100644 index 00000000..5fa9f113 Binary files /dev/null and b/resources/contenttweaker/textures/items/shield_of_the_arbiter.png differ diff --git a/resources/contenttweaker/textures/items/shield_of_the_arbiter.png.mcmeta b/resources/contenttweaker/textures/items/shield_of_the_arbiter.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/shield_of_the_arbiter.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/shield_of_the_king_in_purple.png b/resources/contenttweaker/textures/items/shield_of_the_king_in_purple.png new file mode 100644 index 00000000..ed5fc485 Binary files /dev/null and b/resources/contenttweaker/textures/items/shield_of_the_king_in_purple.png differ diff --git a/resources/contenttweaker/textures/items/silvan_fissile_alloy.png b/resources/contenttweaker/textures/items/silvan_fissile_alloy.png new file mode 100644 index 00000000..a60cd8af Binary files /dev/null and b/resources/contenttweaker/textures/items/silvan_fissile_alloy.png differ diff --git a/resources/contenttweaker/textures/items/silvan_fissile_alloy.png.mcmeta b/resources/contenttweaker/textures/items/silvan_fissile_alloy.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/silvan_fissile_alloy.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/silvan_fissile_dust.png b/resources/contenttweaker/textures/items/silvan_fissile_dust.png new file mode 100644 index 00000000..2c793f36 Binary files /dev/null and b/resources/contenttweaker/textures/items/silvan_fissile_dust.png differ diff --git a/resources/contenttweaker/textures/items/slightly_dense_pebble.png b/resources/contenttweaker/textures/items/slightly_dense_pebble.png new file mode 100644 index 00000000..bf6c0f57 Binary files /dev/null and b/resources/contenttweaker/textures/items/slightly_dense_pebble.png differ diff --git a/resources/contenttweaker/textures/items/slightly_dense_pebble.png.mcmeta b/resources/contenttweaker/textures/items/slightly_dense_pebble.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/slightly_dense_pebble.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/softened_black_hole_alloy_clump.png b/resources/contenttweaker/textures/items/softened_black_hole_alloy_clump.png new file mode 100644 index 00000000..2cc0624a Binary files /dev/null and b/resources/contenttweaker/textures/items/softened_black_hole_alloy_clump.png differ diff --git a/resources/contenttweaker/textures/items/softened_black_hole_alloy_clump.png.mcmeta b/resources/contenttweaker/textures/items/softened_black_hole_alloy_clump.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/softened_black_hole_alloy_clump.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/soul_of_kashan.png b/resources/contenttweaker/textures/items/soul_of_kashan.png new file mode 100644 index 00000000..954758e4 Binary files /dev/null and b/resources/contenttweaker/textures/items/soul_of_kashan.png differ diff --git a/resources/contenttweaker/textures/items/spatial_compound.png b/resources/contenttweaker/textures/items/spatial_compound.png new file mode 100644 index 00000000..c2b868a8 Binary files /dev/null and b/resources/contenttweaker/textures/items/spatial_compound.png differ diff --git a/resources/contenttweaker/textures/items/spooder_glasses.png b/resources/contenttweaker/textures/items/spooder_glasses.png new file mode 100644 index 00000000..b8815a53 Binary files /dev/null and b/resources/contenttweaker/textures/items/spooder_glasses.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_arrogance.png b/resources/contenttweaker/textures/items/spren_summoner_arrogance.png new file mode 100644 index 00000000..4d947f8c Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_arrogance.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_balance.png b/resources/contenttweaker/textures/items/spren_summoner_balance.png new file mode 100644 index 00000000..58929092 Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_balance.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_blasphemy.png b/resources/contenttweaker/textures/items/spren_summoner_blasphemy.png new file mode 100644 index 00000000..0e9c0a34 Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_blasphemy.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_control.png b/resources/contenttweaker/textures/items/spren_summoner_control.png new file mode 100644 index 00000000..1f31f27f Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_control.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_death.png b/resources/contenttweaker/textures/items/spren_summoner_death.png new file mode 100644 index 00000000..dd2eb5c7 Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_death.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_faith.png b/resources/contenttweaker/textures/items/spren_summoner_faith.png new file mode 100644 index 00000000..6920282b Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_faith.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_glory.png b/resources/contenttweaker/textures/items/spren_summoner_glory.png new file mode 100644 index 00000000..57fe3493 Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_glory.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_gluttony.png b/resources/contenttweaker/textures/items/spren_summoner_gluttony.png new file mode 100644 index 00000000..39ee9c26 Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_gluttony.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_haste.png b/resources/contenttweaker/textures/items/spren_summoner_haste.png new file mode 100644 index 00000000..3663e0ba Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_haste.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_hope.png b/resources/contenttweaker/textures/items/spren_summoner_hope.png new file mode 100644 index 00000000..9a0bfc92 Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_hope.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_inadequacy.png b/resources/contenttweaker/textures/items/spren_summoner_inadequacy.png new file mode 100644 index 00000000..bcf0ed87 Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_inadequacy.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_injury.png b/resources/contenttweaker/textures/items/spren_summoner_injury.png new file mode 100644 index 00000000..dabc702b Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_injury.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_knowledge.png b/resources/contenttweaker/textures/items/spren_summoner_knowledge.png new file mode 100644 index 00000000..c2512b3a Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_knowledge.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_loneliness.png b/resources/contenttweaker/textures/items/spren_summoner_loneliness.png new file mode 100644 index 00000000..f72a3def Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_loneliness.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_plot.png b/resources/contenttweaker/textures/items/spren_summoner_plot.png new file mode 100644 index 00000000..471b22bb Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_plot.png differ diff --git a/resources/contenttweaker/textures/items/spren_summoner_prepotence.png b/resources/contenttweaker/textures/items/spren_summoner_prepotence.png new file mode 100644 index 00000000..2f995574 Binary files /dev/null and b/resources/contenttweaker/textures/items/spren_summoner_prepotence.png differ diff --git a/resources/contenttweaker/textures/items/stable_fusor.png b/resources/contenttweaker/textures/items/stable_fusor.png index 3d5a7774..9b946042 100644 Binary files a/resources/contenttweaker/textures/items/stable_fusor.png and b/resources/contenttweaker/textures/items/stable_fusor.png differ diff --git a/resources/contenttweaker/textures/items/standard_of_the_shyre_empire.png b/resources/contenttweaker/textures/items/standard_of_the_shyre_empire.png new file mode 100644 index 00000000..02e93092 Binary files /dev/null and b/resources/contenttweaker/textures/items/standard_of_the_shyre_empire.png differ diff --git a/resources/contenttweaker/textures/items/star_core.png b/resources/contenttweaker/textures/items/star_core.png index 88a436cf..c66b3672 100644 Binary files a/resources/contenttweaker/textures/items/star_core.png and b/resources/contenttweaker/textures/items/star_core.png differ diff --git a/resources/contenttweaker/textures/items/stone_of_dimensional_ascension.png b/resources/contenttweaker/textures/items/stone_of_dimensional_ascension.png new file mode 100644 index 00000000..349a0260 Binary files /dev/null and b/resources/contenttweaker/textures/items/stone_of_dimensional_ascension.png differ diff --git a/resources/contenttweaker/textures/items/stone_of_the_love.png b/resources/contenttweaker/textures/items/stone_of_the_love.png new file mode 100644 index 00000000..cb600186 Binary files /dev/null and b/resources/contenttweaker/textures/items/stone_of_the_love.png differ diff --git a/resources/contenttweaker/textures/items/stone_of_the_loved.png b/resources/contenttweaker/textures/items/stone_of_the_loved.png new file mode 100644 index 00000000..f258ba35 Binary files /dev/null and b/resources/contenttweaker/textures/items/stone_of_the_loved.png differ diff --git a/resources/contenttweaker/textures/items/stone_of_the_lover.png b/resources/contenttweaker/textures/items/stone_of_the_lover.png new file mode 100644 index 00000000..d7698610 Binary files /dev/null and b/resources/contenttweaker/textures/items/stone_of_the_lover.png differ diff --git a/resources/contenttweaker/textures/items/stormlight_infused_crystal.png b/resources/contenttweaker/textures/items/stormlight_infused_crystal.png index 238b3ffa..98caff51 100644 Binary files a/resources/contenttweaker/textures/items/stormlight_infused_crystal.png and b/resources/contenttweaker/textures/items/stormlight_infused_crystal.png differ diff --git a/resources/contenttweaker/textures/items/strange_stone_callstone.png b/resources/contenttweaker/textures/items/strange_stone_callstone.png new file mode 100644 index 00000000..f70abf78 Binary files /dev/null and b/resources/contenttweaker/textures/items/strange_stone_callstone.png differ diff --git a/resources/contenttweaker/textures/items/strange_stone_essence.png b/resources/contenttweaker/textures/items/strange_stone_essence.png new file mode 100644 index 00000000..72521b76 Binary files /dev/null and b/resources/contenttweaker/textures/items/strange_stone_essence.png differ diff --git a/resources/contenttweaker/textures/items/summons_of_the_realmshifter_cherubim.png b/resources/contenttweaker/textures/items/summons_of_the_realmshifter_cherubim.png new file mode 100644 index 00000000..594f2674 Binary files /dev/null and b/resources/contenttweaker/textures/items/summons_of_the_realmshifter_cherubim.png differ diff --git a/resources/contenttweaker/textures/items/summons_to_the_meatball_man.png b/resources/contenttweaker/textures/items/summons_to_the_meatball_man.png new file mode 100644 index 00000000..cea8e50d Binary files /dev/null and b/resources/contenttweaker/textures/items/summons_to_the_meatball_man.png differ diff --git a/resources/contenttweaker/textures/items/supercharged_redstonel.png b/resources/contenttweaker/textures/items/supercharged_redstonel.png new file mode 100644 index 00000000..4ee2e716 Binary files /dev/null and b/resources/contenttweaker/textures/items/supercharged_redstonel.png differ diff --git a/resources/contenttweaker/textures/items/supercharged_signalum.png b/resources/contenttweaker/textures/items/supercharged_signalum.png new file mode 100644 index 00000000..076f5c9c Binary files /dev/null and b/resources/contenttweaker/textures/items/supercharged_signalum.png differ diff --git a/resources/contenttweaker/textures/items/supercharged_signalum.png.mcmeta b/resources/contenttweaker/textures/items/supercharged_signalum.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/resources/contenttweaker/textures/items/supercharged_signalum.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/contenttweaker/textures/items/supercharged_wool.png b/resources/contenttweaker/textures/items/supercharged_wool.png new file mode 100644 index 00000000..be5c9e27 Binary files /dev/null and b/resources/contenttweaker/textures/items/supercharged_wool.png differ diff --git a/resources/contenttweaker/textures/items/taint_gun.png b/resources/contenttweaker/textures/items/taint_gun.png new file mode 100644 index 00000000..d6c57951 Binary files /dev/null and b/resources/contenttweaker/textures/items/taint_gun.png differ diff --git a/resources/contenttweaker/textures/items/taint_shield.png b/resources/contenttweaker/textures/items/taint_shield.png new file mode 100644 index 00000000..b5e7bd8e Binary files /dev/null and b/resources/contenttweaker/textures/items/taint_shield.png differ diff --git a/resources/contenttweaker/textures/items/tainted_alchemic_catalyst.png b/resources/contenttweaker/textures/items/tainted_alchemic_catalyst.png new file mode 100644 index 00000000..9a5e9d8d Binary files /dev/null and b/resources/contenttweaker/textures/items/tainted_alchemic_catalyst.png differ diff --git a/resources/contenttweaker/textures/items/tainted_claw.png b/resources/contenttweaker/textures/items/tainted_claw.png new file mode 100644 index 00000000..bd324d51 Binary files /dev/null and b/resources/contenttweaker/textures/items/tainted_claw.png differ diff --git a/resources/contenttweaker/textures/items/tainted_prison_key.png b/resources/contenttweaker/textures/items/tainted_prison_key.png new file mode 100644 index 00000000..bb5f4424 Binary files /dev/null and b/resources/contenttweaker/textures/items/tainted_prison_key.png differ diff --git a/resources/contenttweaker/textures/items/tellurium_crystal.png b/resources/contenttweaker/textures/items/tellurium_crystal.png index cac61e47..a4aeb639 100644 Binary files a/resources/contenttweaker/textures/items/tellurium_crystal.png and b/resources/contenttweaker/textures/items/tellurium_crystal.png differ diff --git a/resources/contenttweaker/textures/items/the_dark_star.png b/resources/contenttweaker/textures/items/the_dark_star.png index 1d0d7c78..97949896 100644 Binary files a/resources/contenttweaker/textures/items/the_dark_star.png and b/resources/contenttweaker/textures/items/the_dark_star.png differ diff --git a/resources/contenttweaker/textures/items/the_ultimate_taint_gun.png b/resources/contenttweaker/textures/items/the_ultimate_taint_gun.png new file mode 100644 index 00000000..a6162942 Binary files /dev/null and b/resources/contenttweaker/textures/items/the_ultimate_taint_gun.png differ diff --git a/resources/contenttweaker/textures/items/time_crystal_lattice.png b/resources/contenttweaker/textures/items/time_crystal_lattice.png new file mode 100644 index 00000000..6bbd951a Binary files /dev/null and b/resources/contenttweaker/textures/items/time_crystal_lattice.png differ diff --git a/resources/contenttweaker/textures/items/token_of_forgiveness.png b/resources/contenttweaker/textures/items/token_of_forgiveness.png new file mode 100644 index 00000000..0b423ae2 Binary files /dev/null and b/resources/contenttweaker/textures/items/token_of_forgiveness.png differ diff --git a/resources/contenttweaker/textures/items/token_of_the_meatball_man.png b/resources/contenttweaker/textures/items/token_of_the_meatball_man.png new file mode 100644 index 00000000..7eab1add Binary files /dev/null and b/resources/contenttweaker/textures/items/token_of_the_meatball_man.png differ diff --git a/resources/contenttweaker/textures/items/trinitas_callstone.png b/resources/contenttweaker/textures/items/trinitas_callstone.png new file mode 100644 index 00000000..60bdad1a Binary files /dev/null and b/resources/contenttweaker/textures/items/trinitas_callstone.png differ diff --git a/resources/contenttweaker/textures/items/trinity_ingot.png b/resources/contenttweaker/textures/items/trinity_ingot.png new file mode 100644 index 00000000..90b56db4 Binary files /dev/null and b/resources/contenttweaker/textures/items/trinity_ingot.png differ diff --git a/resources/contenttweaker/textures/items/trinity_ingot.png.mcmeta b/resources/contenttweaker/textures/items/trinity_ingot.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/trinity_ingot.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/trinity_nugget.png b/resources/contenttweaker/textures/items/trinity_nugget.png new file mode 100644 index 00000000..e94d61c1 Binary files /dev/null and b/resources/contenttweaker/textures/items/trinity_nugget.png differ diff --git a/resources/contenttweaker/textures/items/trinity_runes.png b/resources/contenttweaker/textures/items/trinity_runes.png new file mode 100644 index 00000000..cbeb6aeb Binary files /dev/null and b/resources/contenttweaker/textures/items/trinity_runes.png differ diff --git a/resources/contenttweaker/textures/items/true_tongue_oath.png b/resources/contenttweaker/textures/items/true_tongue_oath.png new file mode 100644 index 00000000..33f2be91 Binary files /dev/null and b/resources/contenttweaker/textures/items/true_tongue_oath.png differ diff --git a/resources/contenttweaker/textures/items/unbound_recursium_fragment.png b/resources/contenttweaker/textures/items/unbound_recursium_fragment.png new file mode 100644 index 00000000..61b849f1 Binary files /dev/null and b/resources/contenttweaker/textures/items/unbound_recursium_fragment.png differ diff --git a/resources/contenttweaker/textures/items/unbound_recursium_fragment.png.mcmeta b/resources/contenttweaker/textures/items/unbound_recursium_fragment.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/unbound_recursium_fragment.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/uncanny_void_cluster.png b/resources/contenttweaker/textures/items/uncanny_void_cluster.png new file mode 100644 index 00000000..04974991 Binary files /dev/null and b/resources/contenttweaker/textures/items/uncanny_void_cluster.png differ diff --git a/resources/contenttweaker/textures/items/uncanny_void_cluster.png.mcmeta b/resources/contenttweaker/textures/items/uncanny_void_cluster.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/uncanny_void_cluster.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/universal_constellation.png b/resources/contenttweaker/textures/items/universal_constellation.png new file mode 100644 index 00000000..5834a185 Binary files /dev/null and b/resources/contenttweaker/textures/items/universal_constellation.png differ diff --git a/resources/contenttweaker/textures/items/universal_constellation_callstone.png b/resources/contenttweaker/textures/items/universal_constellation_callstone.png new file mode 100644 index 00000000..a30d37af Binary files /dev/null and b/resources/contenttweaker/textures/items/universal_constellation_callstone.png differ diff --git a/resources/contenttweaker/textures/items/unleashed_triquetra.png b/resources/contenttweaker/textures/items/unleashed_triquetra.png new file mode 100644 index 00000000..342078f9 Binary files /dev/null and b/resources/contenttweaker/textures/items/unleashed_triquetra.png differ diff --git a/resources/contenttweaker/textures/items/unleashed_triquetra.png.mcmeta b/resources/contenttweaker/textures/items/unleashed_triquetra.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/unleashed_triquetra.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/contenttweaker/textures/items/void_chains.png b/resources/contenttweaker/textures/items/void_chains.png new file mode 100644 index 00000000..526b9ffa Binary files /dev/null and b/resources/contenttweaker/textures/items/void_chains.png differ diff --git a/resources/contenttweaker/textures/items/void_ichorium_gem.png b/resources/contenttweaker/textures/items/void_ichorium_gem.png new file mode 100644 index 00000000..17915227 Binary files /dev/null and b/resources/contenttweaker/textures/items/void_ichorium_gem.png differ diff --git a/resources/contenttweaker/textures/items/void_ichorium_jewel.png b/resources/contenttweaker/textures/items/void_ichorium_jewel.png new file mode 100644 index 00000000..89ba600b Binary files /dev/null and b/resources/contenttweaker/textures/items/void_ichorium_jewel.png differ diff --git a/resources/contenttweaker/textures/items/void_ichorium_rift.png b/resources/contenttweaker/textures/items/void_ichorium_rift.png new file mode 100644 index 00000000..e57d7a6d Binary files /dev/null and b/resources/contenttweaker/textures/items/void_ichorium_rift.png differ diff --git a/resources/contenttweaker/textures/items/vow_to_death.png b/resources/contenttweaker/textures/items/vow_to_death.png new file mode 100644 index 00000000..44a27b1c Binary files /dev/null and b/resources/contenttweaker/textures/items/vow_to_death.png differ diff --git a/resources/contenttweaker/textures/items/warren_configurator.png b/resources/contenttweaker/textures/items/warren_configurator.png new file mode 100644 index 00000000..472ed76d Binary files /dev/null and b/resources/contenttweaker/textures/items/warren_configurator.png differ diff --git a/resources/contenttweaker/textures/items/warren_plate.png b/resources/contenttweaker/textures/items/warren_plate.png new file mode 100644 index 00000000..7faf9924 Binary files /dev/null and b/resources/contenttweaker/textures/items/warren_plate.png differ diff --git a/resources/contenttweaker/textures/items/white_hole_core.png b/resources/contenttweaker/textures/items/white_hole_core.png new file mode 100644 index 00000000..a2110c5c Binary files /dev/null and b/resources/contenttweaker/textures/items/white_hole_core.png differ diff --git a/resources/contenttweaker/textures/items/wish_of_infinity.png b/resources/contenttweaker/textures/items/wish_of_infinity.png new file mode 100644 index 00000000..1d02eaa3 Binary files /dev/null and b/resources/contenttweaker/textures/items/wish_of_infinity.png differ diff --git a/resources/contenttweaker/textures/items/wish_of_infinity.png.mcmeta b/resources/contenttweaker/textures/items/wish_of_infinity.png.mcmeta new file mode 100644 index 00000000..d1cd0799 --- /dev/null +++ b/resources/contenttweaker/textures/items/wish_of_infinity.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/modularmachinery/blockstates/bee_stargate_controller.json b/resources/modularmachinery/blockstates/bee_stargate_controller.json new file mode 100644 index 00000000..80c6339e --- /dev/null +++ b/resources/modularmachinery/blockstates/bee_stargate_controller.json @@ -0,0 +1,43 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "modularmachinery:blockcontroller" + }, + "variants": { + "facing=north,formed=false": { + "model": "modularmachinery:blockcontroller" + }, + "facing=south,formed=false": { + "model": "modularmachinery:blockcontroller", + "y": 180 + }, + "facing=west,formed=false": { + "model": "modularmachinery:blockcontroller", + "y": 270 + }, + "facing=east,formed=false": { + "model": "modularmachinery:blockcontroller", + "y": 90 + }, + "facing=north,formed=true": { + "model": "modularmachinery:blockcontroller" + }, + "facing=south,formed=true": { + "model": "modularmachinery:blockcontroller", + "y": 180 + }, + "facing=west,formed=true": { + "model": "modularmachinery:blockcontroller", + "y": 270 + }, + "facing=east,formed=true": { + "model": "modularmachinery:blockcontroller", + "y": 90 + }, + "inventory": [ + { + "transform": "forge:default-block" + } + ] + } +} diff --git a/resources/modularmachinery/blockstates/wormhole_field_generator_controller.json b/resources/modularmachinery/blockstates/wormhole_field_generator_controller.json new file mode 100644 index 00000000..80c6339e --- /dev/null +++ b/resources/modularmachinery/blockstates/wormhole_field_generator_controller.json @@ -0,0 +1,43 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "modularmachinery:blockcontroller" + }, + "variants": { + "facing=north,formed=false": { + "model": "modularmachinery:blockcontroller" + }, + "facing=south,formed=false": { + "model": "modularmachinery:blockcontroller", + "y": 180 + }, + "facing=west,formed=false": { + "model": "modularmachinery:blockcontroller", + "y": 270 + }, + "facing=east,formed=false": { + "model": "modularmachinery:blockcontroller", + "y": 90 + }, + "facing=north,formed=true": { + "model": "modularmachinery:blockcontroller" + }, + "facing=south,formed=true": { + "model": "modularmachinery:blockcontroller", + "y": 180 + }, + "facing=west,formed=true": { + "model": "modularmachinery:blockcontroller", + "y": 270 + }, + "facing=east,formed=true": { + "model": "modularmachinery:blockcontroller", + "y": 90 + }, + "inventory": [ + { + "transform": "forge:default-block" + } + ] + } +} diff --git a/resources/modularmachinery/blockstates/xp_assimilator_controller.json b/resources/modularmachinery/blockstates/xp_assimilator_controller.json new file mode 100644 index 00000000..80c6339e --- /dev/null +++ b/resources/modularmachinery/blockstates/xp_assimilator_controller.json @@ -0,0 +1,43 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "modularmachinery:blockcontroller" + }, + "variants": { + "facing=north,formed=false": { + "model": "modularmachinery:blockcontroller" + }, + "facing=south,formed=false": { + "model": "modularmachinery:blockcontroller", + "y": 180 + }, + "facing=west,formed=false": { + "model": "modularmachinery:blockcontroller", + "y": 270 + }, + "facing=east,formed=false": { + "model": "modularmachinery:blockcontroller", + "y": 90 + }, + "facing=north,formed=true": { + "model": "modularmachinery:blockcontroller" + }, + "facing=south,formed=true": { + "model": "modularmachinery:blockcontroller", + "y": 180 + }, + "facing=west,formed=true": { + "model": "modularmachinery:blockcontroller", + "y": 270 + }, + "facing=east,formed=true": { + "model": "modularmachinery:blockcontroller", + "y": 90 + }, + "inventory": [ + { + "transform": "forge:default-block" + } + ] + } +} diff --git a/scripts/ArbiterMachinery.zs b/scripts/ArbiterMachinery.zs index 9c80e2f1..d6b5a96f 100644 --- a/scripts/ArbiterMachinery.zs +++ b/scripts/ArbiterMachinery.zs @@ -150,7 +150,7 @@ mythmeltactualizingfluid6.build(); val divinecombineralltheshells = RecipeBuilder.newBuilder("divinecombineralltheshells","divine_combiner",2); -divinecombineralltheshells.addEnergyPerTickInput(60000); +divinecombineralltheshells.addFluidInput(*1000); divinecombineralltheshells.addItemInput(); divinecombineralltheshells.addItemInput(); divinecombineralltheshells.addItemInput(); @@ -200,13 +200,13 @@ mith30.addItemOutput(*64); mith30.setChance(0.5); mith30.addItemOutput(*10); mith30.setChance(0.1); -mith30.addItemOutput(*20); +mith30.addItemOutput(*50); +mith30.setChance(0.6); +mith30.addItemOutput(*4); +mith30.setChance(0.8); +mith30.addItemOutput(*64); mith30.setChance(0.1); -mith30.addItemOutput(); -mith30.setChance(0.1); -mith30.addItemOutput(*8); -mith30.setChance(0.1); -mith30.addItemOutput(*12); +mith30.addItemOutput(*32); mith30.setChance(0.1); mith30.addItemOutput(); mith30.build(); @@ -1778,4 +1778,3 @@ creatstarvald6.build(); - diff --git a/scripts/BeeStargatePortalBlocks.zs b/scripts/BeeStargatePortalBlocks.zs new file mode 100644 index 00000000..10d57249 --- /dev/null +++ b/scripts/BeeStargatePortalBlocks.zs @@ -0,0 +1,604 @@ +#loader contenttweaker + +import mods.contenttweaker.VanillaFactory; +import mods.contenttweaker.Item; +import mods.contenttweaker.IItemRightClick; +import mods.contenttweaker.Commands; +import mods.contenttweaker.ItemFood; +import mods.contenttweaker.IItemFoodEaten; +import mods.contenttweaker.MutableItemStack; +import mods.contenttweaker.Hand; +import mods.contenttweaker.World; +import mods.contenttweaker.IItemUpdate; +import mods.contenttweaker.Player; +import crafttweaker.player.IPlayer; +import crafttweaker.block.IBlock; +import crafttweaker.world.IBlockPos; +import crafttweaker.data.IData; +import crafttweaker.util.Position3f; +import mods.contenttweaker.IBlockAction; +import crafttweaker.events.IEventManager; +import crafttweaker.server.IServer; +import crafttweaker.command.ICommandManager; +import crafttweaker.command.ICommandSender; + +var sednaportal = VanillaFactory.createBlock("sedna_portal_block", ); +sednaportal.setBlockHardness(-1.0); +sednaportal.setToolClass("pickaxe"); +sednaportal.setPassable(true); +sednaportal.setFullBlock(false); +sednaportal.setLightValue(0.5); +sednaportal.setBlockLayer("TRANSLUCENT"); +sednaportal.setLightOpacity(0); +sednaportal.setTranslucent(true); +sednaportal.register(); + +var rheniaportal = VanillaFactory.createBlock("rhenia_portal_block", ); +rheniaportal.setBlockHardness(-1.0); +rheniaportal.setToolClass("pickaxe"); +rheniaportal.setPassable(true); +rheniaportal.setFullBlock(false); +rheniaportal.setLightValue(0.5); +rheniaportal.setBlockLayer("TRANSLUCENT"); +rheniaportal.setLightOpacity(0); +rheniaportal.setTranslucent(true); +rheniaportal.register(); + +var haumeaportal = VanillaFactory.createBlock("haumea_portal_block", ); +haumeaportal.setBlockHardness(-1.0); +haumeaportal.setToolClass("pickaxe"); +haumeaportal.setPassable(true); +haumeaportal.setFullBlock(false); +haumeaportal.setLightValue(0.5); +haumeaportal.setBlockLayer("TRANSLUCENT"); +haumeaportal.setLightOpacity(0); +haumeaportal.setTranslucent(true); +haumeaportal.register(); + +var lunaportal = VanillaFactory.createBlock("luna_portal_block", ); +lunaportal.setBlockHardness(-1.0); +lunaportal.setToolClass("pickaxe"); +lunaportal.setPassable(true); +lunaportal.setFullBlock(false); +lunaportal.setLightValue(0.5); +lunaportal.setBlockLayer("TRANSLUCENT"); +lunaportal.setLightOpacity(0); +lunaportal.setTranslucent(true); +lunaportal.register(); + + +var osirisportal = VanillaFactory.createBlock("osiris_portal_block", ); +osirisportal.setBlockHardness(-1.0); +osirisportal.setToolClass("pickaxe"); +osirisportal.setPassable(true); +osirisportal.setFullBlock(false); +osirisportal.setLightValue(0.5); +osirisportal.setBlockLayer("TRANSLUCENT"); +osirisportal.setLightOpacity(0); +osirisportal.setTranslucent(true); +osirisportal.register(); + + +var ptahportal = VanillaFactory.createBlock("ptah_portal_block", ); +ptahportal.setBlockHardness(-1.0); +ptahportal.setToolClass("pickaxe"); +ptahportal.setPassable(true); +ptahportal.setFullBlock(false); +ptahportal.setLightValue(0.5); +ptahportal.setBlockLayer("TRANSLUCENT"); +ptahportal.setLightOpacity(0); +ptahportal.setTranslucent(true); +ptahportal.register(); + + +var hatorportal = VanillaFactory.createBlock("hator_portal_block", ); +hatorportal.setBlockHardness(-1.0); +hatorportal.setToolClass("pickaxe"); +hatorportal.setPassable(true); +hatorportal.setFullBlock(false); +hatorportal.setLightValue(0.5); +hatorportal.setBlockLayer("TRANSLUCENT"); +hatorportal.setLightOpacity(0); +hatorportal.setTranslucent(true); +hatorportal.register(); + + +var europaportal = VanillaFactory.createBlock("europa_portal_block", ); +europaportal.setBlockHardness(-1.0); +europaportal.setToolClass("pickaxe"); +europaportal.setPassable(true); +europaportal.setFullBlock(false); +europaportal.setLightValue(0.5); +europaportal.setBlockLayer("TRANSLUCENT"); +europaportal.setLightOpacity(0); +europaportal.setTranslucent(true); +europaportal.register(); + +var oiportal = VanillaFactory.createBlock("oi_portal_block", ); +oiportal.setBlockHardness(-1.0); +oiportal.setToolClass("pickaxe"); +oiportal.setPassable(true); +oiportal.setFullBlock(false); +oiportal.setLightValue(0.5); +oiportal.setBlockLayer("TRANSLUCENT"); +oiportal.setLightOpacity(0); +oiportal.setTranslucent(true); +oiportal.register(); + + +var falacerportal = VanillaFactory.createBlock("falacer_portal_block", ); +falacerportal.setBlockHardness(-1.0); +falacerportal.setToolClass("pickaxe"); +falacerportal.setPassable(true); +falacerportal.setFullBlock(false); +falacerportal.setLightValue(0.5); +falacerportal.setBlockLayer("TRANSLUCENT"); +falacerportal.setLightOpacity(0); +falacerportal.setTranslucent(true); +falacerportal.register(); + + +var orcusportal = VanillaFactory.createBlock("orcus_portal_block", ); +orcusportal.setBlockHardness(-1.0); +orcusportal.setToolClass("pickaxe"); +orcusportal.setPassable(true); +orcusportal.setFullBlock(false); +orcusportal.setLightValue(0.5); +orcusportal.setBlockLayer("TRANSLUCENT"); +orcusportal.setLightOpacity(0); +orcusportal.setTranslucent(true); +orcusportal.register(); + + +var myrmexportal = VanillaFactory.createBlock("myrmex_portal_block", ); +myrmexportal.setBlockHardness(-1.0); +myrmexportal.setToolClass("pickaxe"); +myrmexportal.setPassable(true); +myrmexportal.setFullBlock(false); +myrmexportal.setLightValue(0.5); +myrmexportal.setBlockLayer("TRANSLUCENT"); +myrmexportal.setLightOpacity(0); +myrmexportal.setTranslucent(true); +myrmexportal.register(); + + +var pixoniaportal = VanillaFactory.createBlock("pixonia_portal_block", ); +pixoniaportal.setBlockHardness(-1.0); +pixoniaportal.setToolClass("pickaxe"); +pixoniaportal.setPassable(true); +pixoniaportal.setFullBlock(false); +pixoniaportal.setLightValue(0.5); +pixoniaportal.setBlockLayer("TRANSLUCENT"); +pixoniaportal.setLightOpacity(0); +pixoniaportal.setTranslucent(true); +pixoniaportal.register(); + +var proximaportal = VanillaFactory.createBlock("proxima_portal_block", ); +proximaportal.setBlockHardness(-1.0); +proximaportal.setToolClass("pickaxe"); +proximaportal.setPassable(true); +proximaportal.setFullBlock(false); +proximaportal.setLightValue(0.5); +proximaportal.setBlockLayer("TRANSLUCENT"); +proximaportal.setLightOpacity(0); +proximaportal.setTranslucent(true); +proximaportal.register(); + + +var zoiportal = VanillaFactory.createBlock("zoi_portal_block", ); +zoiportal.setBlockHardness(-1.0); +zoiportal.setToolClass("pickaxe"); +zoiportal.setPassable(true); +zoiportal.setFullBlock(false); +zoiportal.setLightValue(0.5); +zoiportal.setBlockLayer("TRANSLUCENT"); +zoiportal.setLightOpacity(0); +zoiportal.setTranslucent(true); +zoiportal.register(); + +var neroportal = VanillaFactory.createBlock("nero_portal_block", ); +neroportal.setBlockHardness(-1.0); +neroportal.setToolClass("pickaxe"); +neroportal.setPassable(true); +neroportal.setFullBlock(false); +neroportal.setLightValue(0.5); +neroportal.setBlockLayer("TRANSLUCENT"); +neroportal.setLightOpacity(0); +neroportal.setTranslucent(true); +neroportal.register(); + + +var akathartosportal = VanillaFactory.createBlock("akathartos_portal_block", ); +akathartosportal.setBlockHardness(-1.0); +akathartosportal.setToolClass("pickaxe"); +akathartosportal.setPassable(true); +akathartosportal.setFullBlock(false); +akathartosportal.setLightValue(0.5); +akathartosportal.setBlockLayer("TRANSLUCENT"); +akathartosportal.setLightOpacity(0); +akathartosportal.setTranslucent(true); +akathartosportal.register(); + +var pauramportal = VanillaFactory.createBlock("pauram_portal_block", ); +pauramportal.setBlockHardness(-1.0); +pauramportal.setToolClass("pickaxe"); +pauramportal.setPassable(true); +pauramportal.setFullBlock(false); +pauramportal.setLightValue(0.5); +pauramportal.setBlockLayer("TRANSLUCENT"); +pauramportal.setLightOpacity(0); +pauramportal.setTranslucent(true); +pauramportal.register(); + + +var alkemiaportal = VanillaFactory.createBlock("alkemia_portal_block", ); +alkemiaportal.setBlockHardness(-1.0); +alkemiaportal.setToolClass("pickaxe"); +alkemiaportal.setPassable(true); +alkemiaportal.setFullBlock(false); +alkemiaportal.setLightValue(0.5); +alkemiaportal.setBlockLayer("TRANSLUCENT"); +alkemiaportal.setLightOpacity(0); +alkemiaportal.setTranslucent(true); +alkemiaportal.register(); + + +var apichisiportal = VanillaFactory.createBlock("apichisi_portal_block", ); +apichisiportal.setBlockHardness(-1.0); +apichisiportal.setToolClass("pickaxe"); +apichisiportal.setPassable(true); +apichisiportal.setFullBlock(false); +apichisiportal.setLightValue(0.5); +apichisiportal.setBlockLayer("TRANSLUCENT"); +apichisiportal.setLightOpacity(0); +apichisiportal.setTranslucent(true); +apichisiportal.register(); + + +var taerrapiattaportal = VanillaFactory.createBlock("taerrapiatta_portal_block", ); +taerrapiattaportal.setBlockHardness(-1.0); +taerrapiattaportal.setToolClass("pickaxe"); +taerrapiattaportal.setPassable(true); +taerrapiattaportal.setFullBlock(false); +taerrapiattaportal.setLightValue(0.5); +taerrapiattaportal.setBlockLayer("TRANSLUCENT"); +taerrapiattaportal.setLightOpacity(0); +taerrapiattaportal.setTranslucent(true); +taerrapiattaportal.register(); + +var diamerismaportal = VanillaFactory.createBlock("diamerisma_portal_block", ); +diamerismaportal.setBlockHardness(-1.0); +diamerismaportal.setToolClass("pickaxe"); +diamerismaportal.setPassable(true); +diamerismaportal.setFullBlock(false); +diamerismaportal.setLightValue(0.5); +diamerismaportal.setBlockLayer("TRANSLUCENT"); +diamerismaportal.setLightOpacity(0); +diamerismaportal.setTranslucent(true); +diamerismaportal.register(); + +var furattoportal = VanillaFactory.createBlock("furatto_portal_block", ); +furattoportal.setBlockHardness(-1.0); +furattoportal.setToolClass("pickaxe"); +furattoportal.setPassable(true); +furattoportal.setFullBlock(false); +furattoportal.setLightValue(0.5); +furattoportal.setBlockLayer("TRANSLUCENT"); +furattoportal.setLightOpacity(0); +furattoportal.setTranslucent(true); +furattoportal.register(); + +var finemportal = VanillaFactory.createBlock("finem_portal_block", ); +finemportal.setBlockHardness(-1.0); +finemportal.setToolClass("pickaxe"); +finemportal.setPassable(true); +finemportal.setFullBlock(false); +finemportal.setLightValue(0.5); +finemportal.setBlockLayer("TRANSLUCENT"); +finemportal.setLightOpacity(0); +finemportal.setTranslucent(true); +finemportal.register(); + +var lyndenwyrmportal = VanillaFactory.createBlock("lyndenwyrm_portal_block", ); +lyndenwyrmportal.setBlockHardness(-1.0); +lyndenwyrmportal.setToolClass("pickaxe"); +lyndenwyrmportal.setPassable(true); +lyndenwyrmportal.setFullBlock(false); +lyndenwyrmportal.setLightValue(0.5); +lyndenwyrmportal.setBlockLayer("TRANSLUCENT"); +lyndenwyrmportal.setLightOpacity(0); +lyndenwyrmportal.setTranslucent(true); +lyndenwyrmportal.register(); + +var gallifreyportal = VanillaFactory.createBlock("gallifrey_portal_block", ); +gallifreyportal.setBlockHardness(-1.0); +gallifreyportal.setToolClass("pickaxe"); +gallifreyportal.setPassable(true); +gallifreyportal.setFullBlock(false); +gallifreyportal.setLightValue(0.5); +gallifreyportal.setBlockLayer("TRANSLUCENT"); +gallifreyportal.setLightOpacity(0); +gallifreyportal.setTranslucent(true); +gallifreyportal.register(); + + + + + + + +//Would be nice if contenttweaker exposed onBlockActivated. Could probabily do this in MMEvents.onMachinePostTick() with only one portal block if desired +events.onPlayerInteractBlock(function(event as crafttweaker.event.PlayerInteractBlockEvent) { + if (!event.world.isRemote()) { + + // Check if player is interacting with a portal block and inside that same one, then normal warper function + if (event.block.definition.id == "contenttweaker:sedna_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:sedna_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 147", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + if (event.block.definition.id == "contenttweaker:rhenia_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:rhenia_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 163", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + if (event.block.definition.id == "contenttweaker:haumea_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:haumea_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 146", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + if (event.block.definition.id == "contenttweaker:luna_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:luna_portal_block") { + Commands.call("cofh tpx @p 145", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + + if (event.block.definition.id == "contenttweaker:osiris_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:osiris_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 148", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + if (event.block.definition.id == "contenttweaker:ptah_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:ptah_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 149", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + + if (event.block.definition.id == "contenttweaker:hator_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:hator_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 150", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + if (event.block.definition.id == "contenttweaker:europa_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:europa_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 151", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + if (event.block.definition.id == "contenttweaker:oi_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:oi_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 152", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + + if (event.block.definition.id == "contenttweaker:falacer_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:falacer_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 160", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + + if (event.block.definition.id == "contenttweaker:orcus_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:orcus_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 161", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + if (event.block.definition.id == "contenttweaker:myrmex_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:myrmex_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 164", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + + if (event.block.definition.id == "contenttweaker:pixonia_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:pixonia_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 165", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + + if (event.block.definition.id == "contenttweaker:proxima_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:proxima_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 166", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + if (event.block.definition.id == "contenttweaker:zoi_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:zoi_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 171", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + if (event.block.definition.id == "contenttweaker:nero_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:nero_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 170", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + + if (event.block.definition.id == "contenttweaker:akathartos_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:akathartos_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 172", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + + if (event.block.definition.id == "contenttweaker:pauram_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:pauram_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 173", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + + if (event.block.definition.id == "contenttweaker:alkemia_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:alkemia_portal_block") { + if(event.world.getBiome(event.player.position as IBlockPos).name != "Space") { + event.player.sendChat("需位于空间站"); + return; + } + Commands.call("cofh tpx @p 174", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + + if (event.block.definition.id == "contenttweaker:apichisi_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:apichisi_portal_block") { + Commands.call("cofh tpx @p 184", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + if (event.block.definition.id == "contenttweaker:taerrapiatta_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:taerrapiatta_portal_block") { + Commands.call("cofh tpx @p 180", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + if (event.block.definition.id == "contenttweaker:diamerisma_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:diamerisma_portal_block") { + Commands.call("cofh tpx @p 181", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + if (event.block.definition.id == "contenttweaker:furatto_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:furatto_portal_block") { + Commands.call("cofh tpx @p 182", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + if (event.block.definition.id == "contenttweaker:finem_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:finem_portal_block") { + Commands.call("cofh tpx @p 185", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + if (event.block.definition.id == "contenttweaker:lyndenwyrm_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:lyndenwyrm_portal_block") { + Commands.call("cofh tpx @p 162", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + if (event.block.definition.id == "contenttweaker:gallifrey_portal_block" && + event.world.getBlock(event.player.x as int, event.player.y as int, event.player.z as int).definition.id == "contenttweaker:gallifrey_portal_block") { + Commands.call("cofh tpx @p 624", event.player, event.world, true, true); + Commands.call("summon astralsorcery:entitystarburst", event.player, event.world, true, true); + return; + } + + + + return; +} +return; +}); diff --git a/scripts/BiomeItems.zs b/scripts/BiomeItems.zs index d6504387..63324f86 100644 --- a/scripts/BiomeItems.zs +++ b/scripts/BiomeItems.zs @@ -694,7 +694,7 @@ sprensummonerfaith.itemRightClick = function(stack, world, player, hand) { } if((OceanMatches) == 1) { - Commands.call("summon ebwizardry:spectral_golem ~ ~2 ~ {CustomName:\"腐化信仰之灵\",HandItems:[{Count:1,id:\"contenttweaker:shard_of_restored_faith\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:10000.0},{Name:generic.attackDamage, Base:10000.0}],Health:10000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:200,permshields:200}}}", player, world, false, true); + Commands.call("summon divinerpg:skythern_golem ~ ~2 ~ {CustomName:\"腐化信仰之灵\",HandItems:[{Count:1,id:\"contenttweaker:shard_of_restored_faith\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:10000.0},{Name:generic.attackDamage, Base:10000.0}],Health:10000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:200,permshields:200}}}", player, world, false, true); stack.shrink(1); return "PASS"; } @@ -968,7 +968,7 @@ sprensummonerhelplessness.itemRightClick = function(stack, world, player, hand) } if((OceanMatches) == 1) { - Commands.call("summon mod_lavacow:ghost_swarmer ~ ~2 ~ {CustomName:\"欠损之灵\",HandItems:[{Count:1,id:\"contenttweaker:shard_of_realized_worth\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:10000.0},{Name:generic.attackDamage, Base:10000.0}],Health:10000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:200,permshields:200}}}", player, world, false, true); + Commands.call("summon mod_lavacow:ghost_swarmer ~ ~2 ~ {CustomName:\"自轻之灵\",HandItems:[{Count:1,id:\"contenttweaker:shard_of_realized_worth\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:10000.0},{Name:generic.attackDamage, Base:10000.0}],Health:10000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:200,permshields:200}}}", player, world, false, true); stack.shrink(1); return "PASS"; } @@ -1148,7 +1148,7 @@ sprensummonergluttony.itemRightClick = function(stack, world, player, hand) { } if((OceanMatches) == 1) { - Commands.call("summon mod_lavacow:soulworm ~ ~2 ~ {CustomName:\"暴食之魂\",HandItems:[{Count:1,id:\"contenttweaker:shard_of_individual_freedom\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:10000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:200,permshields:200}}}", player, world, false, true); + Commands.call("summon mod_lavacow:soulworm ~ ~2 ~ {CustomName:\"暴食之灵\",HandItems:[{Count:1,id:\"contenttweaker:shard_of_controlled_gluttony\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:10000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:200,permshields:200}}}", player, world, false, true); stack.shrink(1); return "PASS"; } @@ -1193,7 +1193,7 @@ sprensummonerarrogance.itemRightClick = function(stack, world, player, hand) { } if((OceanMatches) == 1) { - Commands.call("summon divinerpg:rainbour ~ ~2 ~ {CustomName:\"矜狂之灵\",HandItems:[{Count:1,id:\"contenttweaker:shard_of_individual_freedom\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:10000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:200,permshields:200}}}", player, world, false, true); + Commands.call("summon divinerpg:rainbour ~ ~2 ~ {CustomName:\"矜狂之灵\",HandItems:[{Count:1,id:\"contenttweaker:shard_of_humble_education\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:10000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:200,permshields:200}}}", player, world, false, true); stack.shrink(1); return "PASS"; } @@ -1256,25 +1256,25 @@ oathoftheundeadlords.itemRightClick = function(stack, world, player, hand) { if((IromineMatches) == 1) { - Commands.call("summon thaumcraft:cultistcleric ~ ~2 ~ {CustomName:\"色欲领主\",HandItems:[{Count:1,id:\"contenttweaker:respect_of_the_lord_of_lust\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:1000000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:400,permshields:400}},ArmorItems:[{Count:1,id:\"avaritia:infinity_boots\"},{Count:1,id:\"avaritia:infinity_pants\"},{Count:1,id:\"avaritia:infinity_chestplate\"},{Count:1,id:\"avaritia:infinity_helmet\"}]}", player, world, false, true); + Commands.call("summon thaumcraft:cultistcleric ~ ~2 ~ {CustomName:\"色欲之主\",HandItems:[{Count:1,id:\"contenttweaker:respect_of_the_lord_of_lust\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:1000000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:400,permshields:400}},ArmorItems:[{Count:1,id:\"avaritia:infinity_boots\"},{Count:1,id:\"avaritia:infinity_pants\"},{Count:1,id:\"avaritia:infinity_chestplate\"},{Count:1,id:\"avaritia:infinity_helmet\"}]}", player, world, false, true); stack.shrink(1); return "PASS"; } if((BoreanMatches) == 1) { - Commands.call("summon thaumcraft:cultistcleric ~ ~2 ~ {CustomName:\"傲慢领主\",HandItems:[{Count:1,id:\"contenttweaker:respect_of_the_lord_of_pride\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:1000000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:400,permshields:400}},ArmorItems:[{Count:1,id:\"avaritia:infinity_boots\"},{Count:1,id:\"avaritia:infinity_pants\"},{Count:1,id:\"avaritia:infinity_chestplate\"},{Count:1,id:\"avaritia:infinity_helmet\"}]}", player, world, false, true); + Commands.call("summon thaumcraft:cultistcleric ~ ~2 ~ {CustomName:\"傲慢之主\",HandItems:[{Count:1,id:\"contenttweaker:respect_of_the_lord_of_pride\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:1000000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:400,permshields:400}},ArmorItems:[{Count:1,id:\"avaritia:infinity_boots\"},{Count:1,id:\"avaritia:infinity_pants\"},{Count:1,id:\"avaritia:infinity_chestplate\"},{Count:1,id:\"avaritia:infinity_helmet\"}]}", player, world, false, true); stack.shrink(1); return "PASS"; } if((CeleveMatches) == 1) { - Commands.call("summon thaumcraft:cultistcleric ~ ~2 ~ {CustomName:\"嫉妒领主\",HandItems:[{Count:1,id:\"contenttweaker:respect_of_the_lord_of_envy\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:1000000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:400,permshields:400}},ArmorItems:[{Count:1,id:\"avaritia:infinity_boots\"},{Count:1,id:\"avaritia:infinity_pants\"},{Count:1,id:\"avaritia:infinity_chestplate\"},{Count:1,id:\"avaritia:infinity_helmet\"}]}", player, world, false, true); + Commands.call("summon thaumcraft:cultistcleric ~ ~2 ~ {CustomName:\"嫉妒之主\",HandItems:[{Count:1,id:\"contenttweaker:respect_of_the_lord_of_envy\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:1000000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:400,permshields:400}},ArmorItems:[{Count:1,id:\"avaritia:infinity_boots\"},{Count:1,id:\"avaritia:infinity_pants\"},{Count:1,id:\"avaritia:infinity_chestplate\"},{Count:1,id:\"avaritia:infinity_helmet\"}]}", player, world, false, true); stack.shrink(1); return "PASS"; } if((RunandorMatches) == 1) { - Commands.call("summon thaumcraft:cultistcleric ~ ~2 ~ {CustomName:\"暴怒领主\",HandItems:[{Count:1,id:\"contenttweaker:respect_of_the_lord_of_wrath\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:1000000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:400,permshields:400}},ArmorItems:[{Count:1,id:\"avaritia:infinity_boots\"},{Count:1,id:\"avaritia:infinity_pants\"},{Count:1,id:\"avaritia:infinity_chestplate\"},{Count:1,id:\"avaritia:infinity_helmet\"}]}", player, world, false, true); + Commands.call("summon thaumcraft:cultistcleric ~ ~2 ~ {CustomName:\"暴怒之主\",HandItems:[{Count:1,id:\"contenttweaker:respect_of_the_lord_of_wrath\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:1000000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:400,permshields:400}},ArmorItems:[{Count:1,id:\"avaritia:infinity_boots\"},{Count:1,id:\"avaritia:infinity_pants\"},{Count:1,id:\"avaritia:infinity_chestplate\"},{Count:1,id:\"avaritia:infinity_helmet\"}]}", player, world, false, true); stack.shrink(1); return "PASS"; } @@ -1286,13 +1286,13 @@ oathoftheundeadlords.itemRightClick = function(stack, world, player, hand) { } if((MysteriumMatches) == 1) { - Commands.call("summon thaumcraft:cultistcleric ~ ~2 ~ {CustomName:\"贪婪领主\",HandItems:[{Count:1,id:\"contenttweaker:respect_of_the_lord_of_greed\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:1000000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:400,permshields:400}},ArmorItems:[{Count:1,id:\"avaritia:infinity_boots\"},{Count:1,id:\"avaritia:infinity_pants\"},{Count:1,id:\"avaritia:infinity_chestplate\"},{Count:1,id:\"avaritia:infinity_helmet\"}]}", player, world, false, true); + Commands.call("summon thaumcraft:cultistcleric ~ ~2 ~ {CustomName:\"贪婪之主\",HandItems:[{Count:1,id:\"contenttweaker:respect_of_the_lord_of_greed\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:1000000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:400,permshields:400}},ArmorItems:[{Count:1,id:\"avaritia:infinity_boots\"},{Count:1,id:\"avaritia:infinity_pants\"},{Count:1,id:\"avaritia:infinity_chestplate\"},{Count:1,id:\"avaritia:infinity_helmet\"}]}", player, world, false, true); stack.shrink(1); return "PASS"; } if((IcespikesMatches) == 1) { - Commands.call("summon thaumcraft:cultistcleric ~ ~2 ~ {CustomName:\"懒惰领主\",HandItems:[{Count:1,id:\"contenttweaker:respect_of_the_lord_of_sloth\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:1000000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:400,permshields:400}},ArmorItems:[{Count:1,id:\"avaritia:infinity_boots\"},{Count:1,id:\"avaritia:infinity_pants\"},{Count:1,id:\"avaritia:infinity_chestplate\"},{Count:1,id:\"avaritia:infinity_helmet\"}]}", player, world, false, true); + Commands.call("summon thaumcraft:cultistcleric ~ ~2 ~ {CustomName:\"怠惰之主\",HandItems:[{Count:1,id:\"contenttweaker:respect_of_the_lord_of_sloth\"},{}],HandDropChances:[1.0f,0.0f],Attributes:[{Name:generic.maxHealth, Base:1000000.0},{Name:generic.attackDamage, Base:1000000.0}],Health:1000000f,ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:400,permshields:400}},ArmorItems:[{Count:1,id:\"avaritia:infinity_boots\"},{Count:1,id:\"avaritia:infinity_pants\"},{Count:1,id:\"avaritia:infinity_chestplate\"},{Count:1,id:\"avaritia:infinity_helmet\"}]}", player, world, false, true); stack.shrink(1); return "PASS"; } diff --git a/scripts/BlackHoleBosses.zs b/scripts/BlackHoleBosses.zs index 44d82ae5..937023f7 100644 --- a/scripts/BlackHoleBosses.zs +++ b/scripts/BlackHoleBosses.zs @@ -18,9 +18,23 @@ sterilizedparafrosynium.addItemInput(); sterilizedparafrosynium.addItemInput(*4); sterilizedparafrosynium.addItemInput(*64); sterilizedparafrosynium.addItemInput(*16); +sterilizedparafrosynium.addItemInput(); sterilizedparafrosynium.addItemOutput(*2); sterilizedparafrosynium.build(); +val sterilizedparafrosynium2 = RecipeBuilder.newBuilder("sterilizedparafrosynium2","sterilized_altar",200); +sterilizedparafrosynium2.addEnergyPerTickInput(10000000); +sterilizedparafrosynium2.addFluidInput(*10000); +sterilizedparafrosynium2.addFluidInput(*10000); +sterilizedparafrosynium2.addItemInput(); +sterilizedparafrosynium2.addItemInput(); +sterilizedparafrosynium2.addItemInput(*4); +sterilizedparafrosynium2.addItemInput(*64); +sterilizedparafrosynium2.addItemInput(*16); +sterilizedparafrosynium2.addItemInput(); +sterilizedparafrosynium2.addItemOutput(*6); +sterilizedparafrosynium2.build(); + mods.extendedcrafting.CompressionCrafting.addRecipe(, , 200, , 10000000); mods.extendedcrafting.CompressionCrafting.addRecipe(, , 200, , 10000000); mods.extendedcrafting.CompressionCrafting.addRecipe(, , 200, , 10000000); @@ -231,9 +245,30 @@ makeichorium.addItemInput(*2); makeichorium.addItemInput(*16); makeichorium.addItemInput(); makeichorium.addItemInput(); +makeichorium.addItemInput(); makeichorium.addItemOutput(); makeichorium.build(); +val makeichorium2 = RecipeBuilder.newBuilder("makeichorium2","arcane_autoinfuser",200); +makeichorium2.addEnergyPerTickInput(150000000); +makeichorium2.addItemInput(.withTag({Aspects: [{amount: 1, key: "alkimia"}]})*300); +makeichorium2.addItemInput(.withTag({Aspects: [{amount: 1, key: "mythus"}]})*100); +makeichorium2.addItemInput(.withTag({Aspects: [{amount: 1, key: "desiderium"}]})*200); +makeichorium2.addItemInput(.withTag({Aspects: [{amount: 1, key: "alienis"}]})*100); +makeichorium2.addItemInput(.withTag({Aspects: [{amount: 1, key: "potentia"}]})*100); +makeichorium2.addItemInput(.withTag({Aspects: [{amount: 1, key: "spiritus"}]})*50); +makeichorium2.addItemInput(.withTag({Aspects: [{amount: 1, key: "aversio"}]})*50); +makeichorium2.addItemInput(*8); +makeichorium2.addItemInput(*2); +makeichorium2.addItemInput(*16); +makeichorium2.addItemInput(); +makeichorium2.addItemInput(); +makeichorium2.addItemInput(); +makeichorium2.addItemOutput(*3); +makeichorium2.build(); + + + mods.thaumcraft.Infusion.registerRecipe("infusionichoriumcatalyst", "", , 10, [*150, *180, *200, *60], @@ -510,9 +545,22 @@ dragonfireorichalcum.addFluidInput(*25000); dragonfireorichalcum.addItemInput(*8); dragonfireorichalcum.addItemInput(*4); dragonfireorichalcum.addItemInput(*12); +dragonfireorichalcum.addItemInput(); dragonfireorichalcum.addItemOutput(); dragonfireorichalcum.build(); +val dragonfireorichalcum2 = RecipeBuilder.newBuilder("dragonfireorichalcum2","dragonfire_crucible",200); +dragonfireorichalcum2.addFluidInput(*25000); +dragonfireorichalcum2.addItemInput(*8); +dragonfireorichalcum2.addItemInput(*4); +dragonfireorichalcum2.addItemInput(*12); +dragonfireorichalcum2.addItemInput(); +dragonfireorichalcum2.addItemOutput(*3); +dragonfireorichalcum2.build(); + + + + // pauram @@ -570,9 +618,23 @@ carminitehihiirokane.addItemInput(*12); carminitehihiirokane.addItemInput(*12); carminitehihiirokane.addItemInput(*32); carminitehihiirokane.addItemInput(*16); +carminitehihiirokane.addItemInput(); carminitehihiirokane.addItemOutput(); carminitehihiirokane.build(); +val carminitehihiirokane2 = RecipeBuilder.newBuilder("carminitehihiirokane2","carminite_empowerer",200); +carminitehihiirokane2.addEnergyPerTickInput(10000000); +carminitehihiirokane2.addAspectInput("victus",50); +carminitehihiirokane2.addItemInput(*2); +carminitehihiirokane2.addItemInput(*12); +carminitehihiirokane2.addItemInput(*12); +carminitehihiirokane2.addItemInput(*32); +carminitehihiirokane2.addItemInput(*16); +carminitehihiirokane2.addItemInput(); +carminitehihiirokane2.addItemOutput(*3); +carminitehihiirokane2.build(); + + mods.bloodmagic.TartaricForge.addRecipe(, [, , , ], 10000.0, 1000.0); mods.nuclearcraft.melter.addRecipe([, *100]); diff --git a/scripts/BloodMagicGating.zs b/scripts/BloodMagicGating.zs index 349b3512..67d678a3 100644 --- a/scripts/BloodMagicGating.zs +++ b/scripts/BloodMagicGating.zs @@ -100,3 +100,9 @@ mods.chisel.Carving.addVariation("ritualdivinermodes", .withTag({current_ritual: "meteor"})); mods.chisel.Carving.addVariation("ritualdivinermodes", .withTag({current_ritual: "blood_burner"})); + + +recipes.addShaped(, +[[, , ], +[, , ], +[, , ]]); \ No newline at end of file diff --git a/scripts/BlueprintController.zs b/scripts/BlueprintController.zs index 83c4c800..7495221d 100644 --- a/scripts/BlueprintController.zs +++ b/scripts/BlueprintController.zs @@ -425,6 +425,12 @@ addController(, "modularmachinery:dyso addController(, "modularmachinery:black_hole_juicer"); +addController(, "modularmachinery:xp_assimilator"); + +addController(, "modularmachinery:wormhole_field_generator"); + +addController(, "modularmachinery:bee_stargate"); + @@ -440,4 +446,3 @@ furnace.addRecipe(, anyBlockControllerDict); - diff --git a/scripts/CallstoneTooltips.zs b/scripts/CallstoneTooltips.zs index 5afb54ac..3e8967c3 100644 --- a/scripts/CallstoneTooltips.zs +++ b/scripts/CallstoneTooltips.zs @@ -94,4 +94,7 @@ .addTooltip(format.red("需在指定维度使用：争竞界")); .addTooltip(format.red("需在指定维度使用：争竞界")); .addTooltip(format.red("需在指定维度使用：衰腐界")); -.addTooltip(format.red("需在指定维度使用：伽里弗雷")); \ No newline at end of file +.addTooltip(format.red("需在指定维度使用：伽里弗雷")); +.addTooltip(format.red("需在指定维度使用：末地")); +.addTooltip(format.red("需在指定维度使用：主世界")); +.addTooltip(format.red("需在指定维度使用：黄金")); \ No newline at end of file diff --git a/scripts/Callstones.zs b/scripts/Callstones.zs index d3993fcf..fe547c75 100644 --- a/scripts/Callstones.zs +++ b/scripts/Callstones.zs @@ -5230,3 +5230,24 @@ strangestonecallstone.itemRightClick = function(stack, world, player, hand) { }; strangestonecallstone.register(); + + + +var livelytreecallstone = VanillaFactory.createItem("lively_tree_callstone"); +livelytreecallstone.maxStackSize = 1; +livelytreecallstone.itemRightClick = function(stack, world, player, hand) { + if(world.remote) { + return "FAIL"; + } + + if(player.getDimension() != 0) { + player.sendChat("需位于主世界"); + return "FAIL"; + } + + Commands.call("pillar-spawn bee_treeoflife_callstone", player, world, false, true); + stack.shrink(1); + return "PASS"; + +}; +livelytreecallstone.register(); \ No newline at end of file diff --git a/scripts/ChickenEgger.zs b/scripts/ChickenEgger.zs new file mode 100644 index 00000000..e13ef8af --- /dev/null +++ b/scripts/ChickenEgger.zs @@ -0,0 +1,23 @@ + + +import crafttweaker.data.IData; + +// recipes.remove(); +// recipes.remove(); + + +val chuckensticc = ; +val chuckeneggo = ; +recipes.addShapeless( + "chickensticctoegg",chuckeneggo, + [(chuckensticc.marked("mark").transformNew(function(item) { return item.withTag(item.tag); })).noReturn()], + function(out,ins,cInfo){ + var chickenspeciestype = ins.mark.tag.Chicken as string; + var outputEggTag as IData = { + ChickenType:{id:chickenspeciestype} + }; + return out.updateTag(outputEggTag); + }, + null +); + diff --git a/scripts/ChiselBlueprint.zs b/scripts/ChiselBlueprint.zs index a81d045d..4ca49753 100644 --- a/scripts/ChiselBlueprint.zs +++ b/scripts/ChiselBlueprint.zs @@ -30,6 +30,8 @@ mods.chisel.Carving.addVariation("modularblueprint", .withTag({dynamicmachine: "modularmachinery:soul_accumulator"})); mods.chisel.Carving.addVariation("modularblueprint", .withTag({dynamicmachine: "modularmachinery:matter_reprocessor"})); mods.chisel.Carving.addVariation("modularblueprint", .withTag({dynamicmachine: "modularmachinery:divine_combiner"})); +mods.chisel.Carving.addVariation("modularblueprint", .withTag({dynamicmachine: "modularmachinery:bee_stargate"})); +mods.chisel.Carving.addVariation("modularblueprint", .withTag({dynamicmachine: "modularmachinery:wormhole_field_generator"})); recipes.addShaped(.withTag({dynamicmachine: "modularmachinery:arcane_autoworkbench"}), [[null,null,], @@ -76,6 +78,7 @@ mods.chisel.Carving.addVariation("magicmultiblocks", .withTag({dynamicmachine: "modularmachinery:everburning_forge"})); mods.chisel.Carving.addVariation("magicmultiblocks", .withTag({dynamicmachine: "modularmachinery:forge_of_the_wyvern"})); mods.chisel.Carving.addVariation("magicmultiblocks", .withTag({dynamicmachine: "modularmachinery:eldritch_impetus_catalyzer"})); +mods.chisel.Carving.addVariation("magicmultiblocks", .withTag({dynamicmachine: "modularmachinery:xp_assimilator"})); recipes.addShaped(.withTag({dynamicmachine: "modularmachinery:neutronium_cannon"}), @@ -247,4 +250,4 @@ mods.chisel.Carving.addVariation("bigresourcegenerators", .withTag({dynamicmachine: "modularmachinery:recursive_brain_in_a_vat_starvald_demelain"})); mods.chisel.Carving.addVariation("bigresourcegenerators", .withTag({dynamicmachine: "modularmachinery:recursive_brain_in_a_vat_tellan"})); mods.chisel.Carving.addVariation("bigresourcegenerators", .withTag({dynamicmachine: "modularmachinery:recursive_brain_in_a_vat_thel"})); -mods.chisel.Carving.addVariation("bigresourcegenerators", .withTag({dynamicmachine: "modularmachinery:recursive_brain_in_a_vat_verdith_anath"})); +mods.chisel.Carving.addVariation("bigresourcegenerators", .withTag({dynamicmachine: "modularmachinery:recursive_brain_in_a_vat_verdith_anath"})); \ No newline at end of file diff --git a/scripts/ChiselController.zs b/scripts/ChiselController.zs index 098bc8d1..ad4485dc 100644 --- a/scripts/ChiselController.zs +++ b/scripts/ChiselController.zs @@ -25,6 +25,8 @@ mods.chisel.Carving.addVariation("modularblueprintcontroller", ); mods.chisel.Carving.addVariation("modularblueprintcontroller", ); mods.chisel.Carving.addVariation("modularblueprintcontroller", ); +mods.chisel.Carving.addVariation("modularblueprintcontroller", ); +mods.chisel.Carving.addVariation("modularblueprintcontroller", ); @@ -70,6 +72,7 @@ mods.chisel.Carving.addVariation("magicmultiblockscontroller", ); mods.chisel.Carving.addVariation("magicmultiblockscontroller", ); mods.chisel.Carving.addVariation("magicmultiblockscontroller", ); +mods.chisel.Carving.addVariation("magicmultiblockscontroller", ); @@ -230,4 +233,4 @@ mods.chisel.Carving.addVariation("bigresourcegeneratorscontroller", ); mods.chisel.Carving.addVariation("bigresourcegeneratorscontroller", ); mods.chisel.Carving.addVariation("bigresourcegeneratorscontroller", ); -mods.chisel.Carving.addVariation("bigresourcegeneratorscontroller", ); +mods.chisel.Carving.addVariation("bigresourcegeneratorscontroller", ); \ No newline at end of file diff --git a/scripts/CustomBees.zs b/scripts/CustomBees.zs index 681e1ad5..122280e4 100644 --- a/scripts/CustomBees.zs +++ b/scripts/CustomBees.zs @@ -1513,4 +1513,6 @@ recipes.addShapeless(*4, recipes.addShapeless(*4, [.reuse(), ]); - +recipes.addShapeless(*4, +[.reuse(), +]); diff --git a/scripts/CustomBees2.zs b/scripts/CustomBees2.zs index c76a9f13..76e269c1 100644 --- a/scripts/CustomBees2.zs +++ b/scripts/CustomBees2.zs @@ -190,3 +190,9 @@ recipes.addShaped(.withTag({Fluid: {FluidName: "fluidhel [, , ], [null, , null]]); + + +recipes.addShaped(, +[[.withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.rf"}), , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.rf"})], +[, , ], +[.withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.rf"}), , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.rf"})]]); diff --git a/scripts/CustomBlocks.zs b/scripts/CustomBlocks.zs index 01e1ca5b..6feee684 100644 --- a/scripts/CustomBlocks.zs +++ b/scripts/CustomBlocks.zs @@ -2669,3 +2669,21 @@ twentyblocks.setToolClass("pickaxe"); twentyblocks.setBeaconBase(true); twentyblocks.setToolLevel(3); twentyblocks.register(); + + +var wormholefieldmodule = VanillaFactory.createBlock("wormhole_field_module", ); +wormholefieldmodule.setBlockHardness(1.0); +wormholefieldmodule.setBlockResistance(2.5); +wormholefieldmodule.setToolClass("pickaxe"); +wormholefieldmodule.setBeaconBase(true); +wormholefieldmodule.setToolLevel(3); +wormholefieldmodule.register(); + + +var fabricoftheorb = VanillaFactory.createBlock("fabric_of_the_orb", ); +fabricoftheorb.setBlockHardness(1.0); +fabricoftheorb.setBlockResistance(2.5); +fabricoftheorb.setToolClass("pickaxe"); +fabricoftheorb.setBeaconBase(true); +fabricoftheorb.setToolLevel(3); +fabricoftheorb.register(); \ No newline at end of file diff --git a/scripts/CustomFluids.zs b/scripts/CustomFluids.zs index 76420b95..8b1119c2 100644 --- a/scripts/CustomFluids.zs +++ b/scripts/CustomFluids.zs @@ -1003,5 +1003,7 @@ coldplasma.register(); var blackholejuice = VanillaFactory.createFluid("black_hole_juice", Color.fromHex("000000")); blackholejuice.register(); +var bewitchedessencebaths = VanillaFactory.createFluid("bewitched_essence_salts", Color.fromHex("83b37d")); +bewitchedessencebaths.register(); diff --git a/scripts/CustomItems2.zs b/scripts/CustomItems2.zs index f33ae8e3..3555cc12 100644 --- a/scripts/CustomItems2.zs +++ b/scripts/CustomItems2.zs @@ -2878,4 +2878,35 @@ definedbar.maxStackSize = 64; definedbar.beaconPayment = false; definedbar.register(); +var saltofknowledge = VanillaFactory.createItem("salt_of_knowledge"); +saltofknowledge.maxStackSize = 64; +saltofknowledge.beaconPayment = false; +saltofknowledge.register(); + + +var clearingtaint = VanillaFactory.createItem("clearing_taint"); +clearingtaint.maxStackSize = 64; +clearingtaint.beaconPayment = false; +clearingtaint.register(); + +var lostcitiesworldgen = VanillaFactory.createItem("lost_cities_worldgen"); +lostcitiesworldgen.maxStackSize = 64; +lostcitiesworldgen.beaconPayment = false; +lostcitiesworldgen.register(); + + +var experienceconfigurator = VanillaFactory.createItem("experience_configurator"); +experienceconfigurator.maxStackSize = 64; +experienceconfigurator.beaconPayment = false; +experienceconfigurator.register(); + +var chargedsignalum = VanillaFactory.createItem("charged_signalum"); +chargedsignalum.maxStackSize = 64; +chargedsignalum.beaconPayment = false; +chargedsignalum.register(); + +var superchargedsignalum = VanillaFactory.createItem("supercharged_signalum"); +superchargedsignalum.maxStackSize = 64; +superchargedsignalum.beaconPayment = false; +superchargedsignalum.register(); diff --git a/scripts/CustomLoot.zs b/scripts/CustomLoot.zs index a147ab45..7ba0276e 100644 --- a/scripts/CustomLoot.zs +++ b/scripts/CustomLoot.zs @@ -572,6 +572,20 @@ fishinglootextrafeesh.addItemEntry(, 15); fishinglootextrafeesh.addItemEntry(, 15); fishinglootextrafeesh.addItemEntry(, 15); fishinglootextrafeesh.addItemEntry(, 15); +fishinglootextrafeesh.addItemEntry(, 15); +fishinglootextrafeesh.addItemEntry(, 15); +fishinglootextrafeesh.addItemEntry(, 15); +fishinglootextrafeesh.addItemEntry(, 15); +fishinglootextrafeesh.addItemEntry(, 15); +fishinglootextrafeesh.addItemEntry(, 15); +fishinglootextrafeesh.addItemEntry(, 15); +fishinglootextrafeesh.addItemEntry(, 15); +fishinglootextrafeesh.addItemEntry(, 15); +fishinglootextrafeesh.addItemEntry(, 15); +fishinglootextrafeesh.addItemEntry(, 15); +fishinglootextrafeesh.addItemEntry(, 15); +fishinglootextrafeesh.addItemEntry(, 15); +fishinglootextrafeesh.addItemEntry(, 15); val hellspot = LootTweaker.getTable("aoa3:entities/mobs/nether/hellspot"); @@ -602,4 +616,3 @@ endertripletshard.addItemEntry(, 5); val lostcitiesloot = LootTweaker.getTable("lostcities:chests/lostcitychest"); val lostcitieslootmeatball = lostcitiesloot.addPool("lostcitieslootmeatball", 2, 3, 0, 0); lostcitieslootmeatball.addItemEntry(, 5); - diff --git a/scripts/DungeonBossDrops.zs b/scripts/DungeonBossDrops.zs index 5701fac9..2a9e488a 100644 --- a/scripts/DungeonBossDrops.zs +++ b/scripts/DungeonBossDrops.zs @@ -844,6 +844,9 @@ recipes.addShapeless(, recipes.addShapeless(, [, , , , ]); +recipes.addShapeless(, +[, , , , ]); + recipes.addShapeless(, [, , , , ]); @@ -1235,20 +1238,20 @@ recipes.addShapeless(, [, ]); recipes.addShapeless(, -[, ]); +[, ]); recipes.addShapeless(, -[, ]); +[, ]); recipes.addShapeless(, -[, ]); +[, ]); recipes.addShapeless(, -[, ]); +[, ]); recipes.addShapeless(, -[, ]); +[, ]); recipes.addShapeless(, -[, ]); +[, ]); recipes.addShapeless(, -[, ]); +[, ]); recipes.addShapeless(, [, , ]); @@ -1259,4 +1262,3 @@ recipes.addShapeless(, - diff --git a/scripts/EpicToolTipper.zs b/scripts/EpicToolTipper.zs index f5118b6a..74ba99f7 100644 --- a/scripts/EpicToolTipper.zs +++ b/scripts/EpicToolTipper.zs @@ -15,7 +15,7 @@ val forJEIepicdisplay = (goodDiamondSword | anythingatall); recipes.addShapeless( "makestuffepiiiic",, - [(anythingatall.marked("mark").transformNew(function(item) { return item.withTag(item.tag); })).noReturn(), + [(anythingatall.marked("mark").transformNew(function(item) { return item.withAmount(1).withTag(item.tag); })).noReturn(), .reuse(), ], function(out,ins,cInfo){ diff --git a/scripts/Fuhai.zs b/scripts/Fuhai.zs index ab4ac18b..d44e1764 100644 --- a/scripts/Fuhai.zs +++ b/scripts/Fuhai.zs @@ -215,7 +215,7 @@ recipes.addShaped(, -mods.thaumcraft.Infusion.registerRecipe("inftaintedprisonkey", "", +mods.thaumcraft.Infusion.registerRecipe("infastralmasterymax", "", , 10, [*10000], , diff --git a/scripts/GameStagesContent.zs b/scripts/GameStagesContent.zs index 9aa727af..c4263b0b 100644 --- a/scripts/GameStagesContent.zs +++ b/scripts/GameStagesContent.zs @@ -38,10 +38,26 @@ recipes.addShaped(, [, .withTag({binding: {kills: 1024, bound: "minecraft:blaze"}}), ]]); -mods.recipestages.Recipes.setRecipeStage("divinestage", ); +mods.recipestages.Recipes.addShaped("addrealmstoneaoa", "divinestage", , [ + [, , ], + [, , ], + [, , ] +]); + + + +recipes.removeShaped(); mods.recipestages.Recipes.setRecipeStage("divinestage", ); +mods.recipestages.Recipes.addShaped("addtwilightclock", "divinestage", , [ + [, , ], + [, , ], + [, , ] +]); + + + mods.thaumcraft.Infusion.registerRecipe("infusionsolstone", "", , 3, [*200, *100, *50], @@ -226,4 +242,4 @@ mods.recipestages.Recipes.addShaped("makemarkofsacrifice", "lostcitiesstage", , [[, , ], [, .reuse(), ], -[, , ]]); +[, , ]]); \ No newline at end of file diff --git a/scripts/JEIdescriptions.zs b/scripts/JEIdescriptions.zs index a95cd000..146526a4 100644 --- a/scripts/JEIdescriptions.zs +++ b/scripts/JEIdescriptions.zs @@ -1429,7 +1429,7 @@ mods.jei.JEI.addDescription(, "", "1. 获得基础工具，前往Y=17以下获得足够的卢比锭来制作锹镐斧！", "", - "2. 用锹镐斧在Y=10以下挖掘[虚无]蓝宝石，来制作匠魂的锤头模具！震击是个不错的属性，因为有急迫效果！", + "2. 用锹镐斧在Y=10以下挖掘[飞升]蓝宝石，来制作匠魂的锤头模具！震击是个不错的属性，因为有急迫效果！", "", "3. 解锁高级合成后，制作毁灭燧石。一开始你得用煤炭充能，但很快就能换成卡莱恩能量之星了！", "", @@ -1700,7 +1700,7 @@ mods.jei.JEI.addDescription(, "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "想不到你居然不试着把线索连起来……", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", - "分别用具有相同元数据的阿兹勒赫瓷砖环绕对应的七宗罪符文（欲望、暴食、贪婪、懒惰、暴怒、嫉妒、傲慢）。" + "分别用具有相同元数据的阿兹勒赫瓷砖环绕对应的七宗罪符文（欲望、暴食、贪婪、怠惰、暴怒、嫉妒、傲慢）。" ]); mods.jei.JEI.addDescription(, @@ -1744,6 +1744,20 @@ mods.jei.JEI.addDescription(, "所有剑都可在奥迦斯找到。" ]); +mods.jei.JEI.addDescription(, +[ + "拜托！至少试着解一下谜题嘛！", + "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", + "说真的！解谜很有意思的！下一页有额外提示！", + "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", + "我不觉得你做好准备了……", + "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", + "想不到你居然不试着把线索连起来……", + "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", + "你真的不想知道吗？！？好吧，太可惜了……" +]); + + mods.jei.JEI.addDescription(, [ "拜托！至少试着解一下谜题嘛！", @@ -2454,9 +2468,9 @@ mods.jei.JEI.addDescription(, @@ -2558,7 +2572,8 @@ mods.jei.JEI.addDescription([], "RFTools维度：900（以及其后的连续数字）", "卡尚【Kashan】：190", "叁壹界【Trinitas】：191", - "衰腐界【Fuhai】：192" + "衰腐界【Fuhai】：192", + "争竞界【Travixte】：193" ]); @@ -3728,7 +3743,7 @@ mods.jei.JEI.addDescription(, "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "说真的！解谜很有意思的！下一页有额外提示！", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", - "药剂师蜂窝可与某些方块合成，制作不同药水精华。暮色森林会告诉你使用何种方块来制作正确的精华。将药水精华与寒霜怖惧碎片结合。", + "药师蜂窝可与某些方块合成，制作不同药水精华。暮色森林会告诉你使用何种方块来制作正确的精华。将药水精华与寒霜怖惧碎片结合。", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "想不到你居然不试着把线索连起来……", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", @@ -3741,11 +3756,11 @@ mods.jei.JEI.addDescription(, @@ -3810,7 +3825,7 @@ mods.jei.JEI.addDescription( "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "想不到你居然不试着把线索连起来……", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", - "将注魔药剂师之石与以下花粉结合：白色、品红色、蓝色、棕色。" + "将注魔药师之石与以下花粉结合：白色、品红色、蓝色、棕色。" ]); mods.jei.JEI.addDescription(, @@ -4391,6 +4406,20 @@ mods.jei.JEI.addDescription([ "使用火花为附魔台提供魔力。每个魔咒的魔力消耗随等级呈指数增长，但可以接受超过铁砧上限的魔咒。" ]); +mods.jei.JEI.addDescription([ + ], +[ + "在巫师之路模组中，需要使用女巫祭坛来产生魔力（ME）！", + "", + "祭坛结构是一个3x2的桌子，可以用任意种类祭坛方块组成。使用原版地毯右击来使祭坛成型！", + "", + "祭坛会被动产生魔力。空手右击祭坛会显示可用魔力及最大魔力。巫师之路的许多机制都需要魔力来运行！", + "", + "自然方块（作物、树、花）的种类关乎魔力上限。祭坛周围的植物种类越多，魔力上限越高！", + "", + "可以通过祭坛周围放置雕像，或在祭坛上摆放物品，来为ME上限和回复速度提供加成。在JEI中搜索'女巫祭坛'来显示相关物品。" +]); + mods.jei.JEI.addDescription([ , ], @@ -4650,18 +4679,22 @@ mods.jei.JEI.addDescription(, "想不到你居然不试着把线索连起来……", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "使用以下方块替换暗色伊塞斯砖块（按方向标记）：", - "北：钴块 ()", + "北：钴块（一二五）", + "南：铂块（一二五）", + "东：琥珀金块（一二五）", + "西：青铜块（一二五）", "", + "东北偏北：Zyth 11", + "西北偏北：Zyth 7", "", + "东南偏南：Zome 5", + "西南偏南：Zome 12", "", + "东北偏东：Zone 2", + "东南偏东：Zone 15", "", - "", - "", - "", - "", - "", - "", - "" + "西北偏西：Zech 3", + "西南偏西：Zech 16" ]); @@ -4765,3 +4798,4 @@ mods.jei.JEI.addDescription([ "利用这一原理，可构建能自动切换多方块结构输入物的装置，这样无需建造多台机器便可处理多种配方。" ]); + diff --git a/scripts/LootTableTweaker/CustomLootTable.zs b/scripts/LootTableTweaker/CustomLootTable.zs index 925e00a6..4df599ed 100644 --- a/scripts/LootTableTweaker/CustomLootTable.zs +++ b/scripts/LootTableTweaker/CustomLootTable.zs @@ -116,6 +116,8 @@ mods.ltt.LootTable.removeTable("railcraft:chests/village_workshop"); mods.ltt.LootTable.removeGlobalItem("iceandfire:copper_ingot"); mods.ltt.LootTable.removeGlobalItem("iceandfire:copper_nugget"); +mods.ltt.LootTable.removeGlobalItem("iceandfire:weezer_blue_album"); + mods.ltt.LootTable.removeGlobalItem("immersiveengineering:shader_bag"); mods.ltt.LootTable.removeItem("champions:champion_loot", "tier#1", "minecraft:book"); @@ -123,4 +125,3 @@ mods.ltt.LootTable.removeItem("champions:champion_loot", "tier#2", "minecraft:bo mods.ltt.LootTable.removeItem("champions:champion_loot", "tier#3", "minecraft:book"); mods.ltt.LootTable.removeItem("champions:champion_loot", "tier#4", "minecraft:book"); - diff --git a/scripts/MagicbaneGating.zs b/scripts/MagicbaneGating.zs deleted file mode 100644 index 036ecab3..00000000 --- a/scripts/MagicbaneGating.zs +++ /dev/null @@ -1,6 +0,0 @@ -recipes.removeShaped(); - -recipes.addShaped(, -[[null, null, ], -[, , null], -[, , null]]); diff --git a/scripts/MasterSpells.zs b/scripts/MasterSpells.zs index 4c53abc8..e57cbe38 100644 --- a/scripts/MasterSpells.zs +++ b/scripts/MasterSpells.zs @@ -350,4 +350,24 @@ masterspellinfernum.itemRightClick = function(stack, world, player, hand) { Commands.call("summon Item ~ ~10 ~ {Item:{id:\"contenttweaker:cursed_dragon_egg\",Count:1b}}", player, world, false, true); return "Pass"; }; -masterspellinfernum.register(); \ No newline at end of file +masterspellinfernum.register(); + + +var masterspellsonus = VanillaFactory.createItem("master_spell_sonus"); +masterspellsonus.maxStackSize = 1; +masterspellsonus.glowing = true; +masterspellsonus.itemRightClick = function(stack, world, player, hand) { + Commands.call("/summon mowziesmobs:naga ~ ~3 ~ {HandItems:[{Count:1,id:\"iceandfire:weezer_blue_album\"},{}],HandDropChances:[1.0f,0.0f],CustomName:\"录音师飞龙\",ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:10,permshields:10}},Attributes:[{Name:generic.maxHealth, Base:5000.0},{Name:generic.attackDamage, Base:100.0}],Health:5000f}", player, world, false, true); + return "Pass"; +}; +masterspellsonus.register(); + + +var masterspellcognitio = VanillaFactory.createItem("master_spell_cognitio"); +masterspellcognitio.maxStackSize = 1; +masterspellcognitio.glowing = true; +masterspellcognitio.itemRightClick = function(stack, world, player, hand) { + Commands.call("/summon thaumcraft:giantbrainyzombie ~ ~3 ~ {HandItems:[{Count:10,id:\"contenttweaker:salt_of_knowledge\"},{}],HandDropChances:[1.0f,0.0f],CustomName:\"红眼僵尸巨人\",ForgeCaps:{\"twilightforest:cap_shield\":{tempshields:40,permshields:40}},Attributes:[{Name:generic.maxHealth, Base:2000.0},{Name:generic.attackDamage, Base:100.0}],Health:2000f}", player, world, false, true); + return "Pass"; +}; +masterspellcognitio.register(); \ No newline at end of file diff --git a/scripts/ModularBeeStargate.zs b/scripts/ModularBeeStargate.zs new file mode 100644 index 00000000..ae8a207f --- /dev/null +++ b/scripts/ModularBeeStargate.zs @@ -0,0 +1,206 @@ +import mods.contenttweaker.VanillaFactory; +import crafttweaker.world.IWorld; +import mods.contenttweaker.Player; +import crafttweaker.player.IPlayer; +import crafttweaker.block.IBlock; +import mods.contenttweaker.BlockState; +import mods.contenttweaker.BlockPos; +import crafttweaker.world.IFacing; +import crafttweaker.block.IBlockState; +import mods.modularmachinery.RecipeBuilder; +import mods.modularmachinery.MachineEvent; +import mods.modularmachinery.MachineTickEvent; +import mods.modularmachinery.RecipeEvent; +import mods.modularmachinery.RecipeStartEvent; +import mods.modularmachinery.RecipeTickEvent; +import mods.modularmachinery.RecipeFinishEvent; +import mods.modularmachinery.MMEvents; +import mods.modularmachinery.IMachineController; +import mods.contenttweaker.Commands; +import crafttweaker.server.IServer; +import crafttweaker.command.ICommandManager; +import crafttweaker.command.ICommandSender; + + +//You can get an IPlayer from event.controller.ownerPlayer but it returns null if they are not online so I have done commands using server.commandManager + +//Example recipe: +var stargatesedna = RecipeBuilder.newBuilder("stargate_sedna","bee_stargate",100); +stargatesedna.addItemInput().setChance(0); +stargatesedna.addFluidInput( * 100); +//Runs when the recipe starts: +stargatesedna.addStartHandler(function(event as RecipeStartEvent) { + beeStargateRecipeStart(event.controller, "contenttweaker:sedna_portal_block", "Sedna"); +}); +stargatesedna.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargatesedna.build(); + + + +var stargaterhenia = RecipeBuilder.newBuilder("stargate_rhenia","bee_stargate",100); +stargaterhenia.addItemInput().setChance(0); +stargaterhenia.addFluidInput( * 100); +stargaterhenia.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:rhenia_portal_block", "Rhenia"); }); +stargaterhenia.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargaterhenia.build(); + + +var stargateluna = RecipeBuilder.newBuilder("stargate_luna","bee_stargate",100); +stargateluna.addItemInput().setChance(0); +stargateluna.addFluidInput( * 100); +stargateluna.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:luna_portal_block", "Luna"); }); +stargateluna.addRecipeTooltip("该配方在激活时会生成一个传送门。", "站在传送门中右击以进行传送。"); +stargateluna.build(); + +var stargateosiris = RecipeBuilder.newBuilder("stargate_osiris","bee_stargate",100); +stargateosiris.addItemInput().setChance(0); +stargateosiris.addFluidInput( * 100); +stargateosiris.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:osiris_portal_block", "Osiris"); }); +stargateosiris.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargateosiris.build(); + + +var stargateptah = RecipeBuilder.newBuilder("stargate_ptah","bee_stargate",100); +stargateptah.addItemInput().setChance(0); +stargateptah.addFluidInput( * 100); +stargateptah.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:ptah_portal_block", "Ptah"); }); +stargateptah.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargateptah.build(); + +var stargatehator = RecipeBuilder.newBuilder("stargate_hator","bee_stargate",100); +stargatehator.addItemInput().setChance(0); +stargatehator.addFluidInput( * 100); +stargatehator.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:hator_portal_block", "Hator"); }); +stargatehator.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargatehator.build(); + +var stargateeuropa = RecipeBuilder.newBuilder("stargate_europa","bee_stargate",100); +stargateeuropa.addItemInput().setChance(0); +stargateeuropa.addFluidInput( * 100); +stargateeuropa.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:europa_portal_block", "Europa"); }); +stargateeuropa.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargateeuropa.build(); + +var stargateoi = RecipeBuilder.newBuilder("stargate_oi","bee_stargate",100); +stargateoi.addItemInput().setChance(0); +stargateoi.addFluidInput( * 100); +stargateoi.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:oi_portal_block", "Oi"); }); +stargateoi.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargateoi.build(); + +var stargatefalacer = RecipeBuilder.newBuilder("stargate_falacer","bee_stargate",100); +stargatefalacer.addItemInput().setChance(0); +stargatefalacer.addFluidInput( * 100); +stargatefalacer.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:falacer_portal_block", "Oi"); }); +stargatefalacer.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargatefalacer.build(); + +var stargateorcus = RecipeBuilder.newBuilder("stargate_orcus","bee_stargate",100); +stargateorcus.addItemInput().setChance(0); +stargateorcus.addFluidInput( * 100); +stargateorcus.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:orcus_portal_block", "Orcus"); }); +stargateorcus.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargateorcus.build(); + +var stargatemyrmex = RecipeBuilder.newBuilder("stargate_myrmex","bee_stargate",100); +stargatemyrmex.addItemInput().setChance(0); +stargatemyrmex.addFluidInput( * 100); +stargatemyrmex.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:myrmex_portal_block", "Myrmex"); }); +stargatemyrmex.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargatemyrmex.build(); + + +var stargatepixonia = RecipeBuilder.newBuilder("stargate_pixonia","bee_stargate",100); +stargatepixonia.addItemInput().setChance(0); +stargatepixonia.addFluidInput( * 100); +stargatepixonia.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:pixonia_portal_block", "Pixonia"); }); +stargatepixonia.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargatepixonia.build(); + +var stargateproxima = RecipeBuilder.newBuilder("stargate_proxima","bee_stargate",100); +stargateproxima.addItemInput().setChance(0); +stargateproxima.addFluidInput( * 100); +stargateproxima.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:proxima_portal_block", "Proxima"); }); +stargateproxima.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargateproxima.build(); + +var stargatenero = RecipeBuilder.newBuilder("stargate_nero","bee_stargate",100); +stargatenero.addItemInput().setChance(0); +stargatenero.addFluidInput( * 100); +stargatenero.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:nero_portal_block", "Nero"); }); +stargatenero.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargatenero.build(); + +var stargatezoi = RecipeBuilder.newBuilder("stargate_zoi","bee_stargate",100); +stargatezoi.addItemInput().setChance(0); +stargatezoi.addFluidInput( * 100); +stargatezoi.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:zoi_portal_block", "Zoi"); }); +stargatezoi.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargatezoi.build(); + +var stargateakathartos = RecipeBuilder.newBuilder("stargate_akathartos","bee_stargate",100); +stargateakathartos.addItemInput().setChance(0); +stargateakathartos.addFluidInput( * 100); +stargateakathartos.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:akathartos_portal_block", "Akathartos"); }); +stargateakathartos.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargateakathartos.build(); + +var stargateakpauram = RecipeBuilder.newBuilder("stargate_pauram","bee_stargate",100); +stargateakpauram.addItemInput().setChance(0); +stargateakpauram.addFluidInput( * 100); +stargateakpauram.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:pauram_portal_block", "Pauram"); }); +stargateakpauram.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargateakpauram.build(); + +var stargateakalkemia = RecipeBuilder.newBuilder("stargate_alkemia","bee_stargate",100); +stargateakalkemia.addItemInput().setChance(0); +stargateakalkemia.addFluidInput( * 100); +stargateakalkemia.addStartHandler(function(event as RecipeStartEvent) { beeStargateRecipeStart(event.controller, "contenttweaker:alkemia_portal_block", "Alkemia"); }); +stargateakalkemia.addRecipeTooltip("该配方在激活时会生成一个传送门。", "多方块结构必须位于太空站。", "站在传送门中右击以进行传送。"); +stargateakalkemia.build(); + + + + + +//Destroy potal if the controller is not running +MMEvents.onMachinePostTick("bee_stargate", function(event as MachineTickEvent) { + var ctrl = event.controller; + if(!ctrl.isWorking && ctrl.world.getBlockState(ctrl.pos.getOffset(up,5).getOffset(ctrl.facing,-4)) != IBlockState.getBlockState("minecraft:air","")) { + beeStargatePlacePortal(ctrl, "minecraft:air"); + var pos = ctrl.pos.getOffset(up,5).getOffset(ctrl.facing,-4); + server.commandManager.executeCommand(server, "playsound minecraft:entity.evocation_illager.cast_spell ambient @a " + pos.x + " " + pos.y + " " + pos.z + " 1 0.5"); + server.commandManager.executeCommand(server, "particle smoke " + pos.x + " " + pos.y + " " + pos.z + " 1 1 1 0.1 200"); + server.commandManager.executeCommand(server, 'execute @a[x=' + pos.x + ',y=' + pos.y + ',z=' + pos.z + ',r=25] ~ ~ ~ tellraw @p {"text":"Stargate offline"}'); + } +}); + +//Do start up sound and message if no current portal, spawn portal if different recipe, or nothing if same portal: +function beeStargateRecipeStart(controller as IMachineController, portalBlock as string, destination as string) { + var pos = controller.pos.getOffset(up,5).getOffset(controller.facing,-4); + var currentPortalBlock = controller.world.getBlockState(pos); + + if (currentPortalBlock != IBlockState.getBlockState(portalBlock,"")) { + if (currentPortalBlock == IBlockState.getBlockState("minecraft:air","")) { + server.commandManager.executeCommand(server, "playsound minecraft:entity.evocation_illager.prepare_summon ambient @a " + pos.x + " " + pos.y + " " + pos.z + " 1 1"); + server.commandManager.executeCommand(server, 'execute @a[x=' + pos.x + ',y=' + pos.y + ',z=' + pos.z + ',r=25] ~ ~ ~ tellraw @p {"text":"Stargate online"}'); + } + beeStargatePlacePortal(controller, portalBlock); + server.commandManager.executeCommand(server, "playsound minecraft:block.portal.trigger block @a " + pos.x + " " + pos.y + " " + pos.z + " 1 1"); + server.commandManager.executeCommand(server, "particle portal " + pos.x + " " + pos.y + " " + pos.z + " 1 1 1 0.1 1000"); + server.commandManager.executeCommand(server, 'execute @a[x=' + pos.x + ',y=' + pos.y + ',z=' + pos.z + ',r=25] ~ ~ ~ tellraw @p {"text":"Current destination: ' + destination + '"}'); + } +} + +//places portal blocks inside the stargate ring: +function beeStargatePlacePortal(controller as IMachineController, portalBlock as string) { + var facing = controller.facing; + var pos = controller.pos.getOffset(up,5).getOffset(facing,-4); + var dx = 0; + var dz = 0; + if (facing == crafttweaker.world.IFacing.north() || facing == crafttweaker.world.IFacing.south()) { dx = 1; } + else { dz = 1; } + server.commandManager.executeCommand(server, "fill " + (pos.x - dx) + " " + (pos.y - 1) + " " + (pos.z - dz) + " " + (pos.x + dx) + " " + (pos.y + 1) + " " + (pos.z + dz) + " " + portalBlock); +} + + diff --git a/scripts/ModularDysonSphere.zs b/scripts/ModularDysonSphere.zs index 1a16382a..2f22d679 100644 --- a/scripts/ModularDysonSphere.zs +++ b/scripts/ModularDysonSphere.zs @@ -63,20 +63,14 @@ recipes.addShaped(, mods.extendedcrafting.TableCrafting.addShaped(, [[, , , , ], [, , , , ], -[, .withTag({"enderio:energy": 500000000}), , .withTag({"enderio:energy": 500000000}), ], +[, , , , ], [, , , , ], [, , , , ]]); -mods.extendedcrafting.TableCrafting.addShaped(, -[[, , , , ], -[, , , , ], -[, .withTag({"enderio:energy": 500000000, "enderio:data": {"faceModes-": 1 as byte, maxOutput: -1, faceDisplayTypes: [3, 0, 1024] as int[], inputControlMode: 0, maxInput: -1, outputControlMode: 0}}), , .withTag({"enderio:energy": 500000000, "enderio:data": {"faceModes-": 1 as byte, maxOutput: -1, faceDisplayTypes: [3, 0, 1024] as int[], inputControlMode: 0, maxInput: -1, outputControlMode: 0}}), ], -[, , , , ], -[, , , , ]]); // recipes.addShaped(, // [[, , ], -// [.withTag({"enderio:energy": 500000000}), , .withTag({"enderio:energy": 500000000})], +// [, , ], // [, , ]]); mods.extendedcrafting.TableCrafting.addShaped(, @@ -266,4 +260,4 @@ null, , null, [, , null, null, , null, -null, , ]]); +null, , ]]); \ No newline at end of file diff --git a/scripts/ModularEnchanting.zs b/scripts/ModularEnchanting.zs index 562f7cc2..abf6dce8 100644 --- a/scripts/ModularEnchanting.zs +++ b/scripts/ModularEnchanting.zs @@ -66,224 +66,224 @@ val array86 as IEnchantmentDefinition[] = []; var map3 as IData = {}; for ench in array3 { - map3 += ench.makeEnchantment(1).makeTag(); + map3 += ench.makeEnchantment(1).makeBookTag(); } var map4 as IData = {}; for ench in array4 { - map4 += ench.makeEnchantment(5).makeTag(); + map4 += ench.makeEnchantment(5).makeBookTag(); } var map5 as IData = {}; for ench in array5 { - map5 += ench.makeEnchantment(8).makeTag(); + map5 += ench.makeEnchantment(8).makeBookTag(); } var map6 as IData = {}; for ench in array6 { - map6 += ench.makeEnchantment(8).makeTag(); + map6 += ench.makeEnchantment(8).makeBookTag(); } var map7 as IData = {}; for ench in array7 { - map7 += ench.makeEnchantment(5).makeTag(); + map7 += ench.makeEnchantment(5).makeBookTag(); } var map8 as IData = {}; for ench in array8 { - map8 += ench.makeEnchantment(5).makeTag(); + map8 += ench.makeEnchantment(5).makeBookTag(); } var map9 as IData = {}; for ench in array9 { - map9 += ench.makeEnchantment(4).makeTag(); + map9 += ench.makeEnchantment(4).makeBookTag(); } var map10 as IData = {}; for ench in array10 { - map10 += ench.makeEnchantment(4).makeTag(); + map10 += ench.makeEnchantment(4).makeBookTag(); } var map11 as IData = {}; for ench in array11 { - map11 += ench.makeEnchantment(4).makeTag(); + map11 += ench.makeEnchantment(4).makeBookTag(); } var map12 as IData = {}; for ench in array12 { - map12 += ench.makeEnchantment(4).makeTag(); + map12 += ench.makeEnchantment(4).makeBookTag(); } var map13 as IData = {}; for ench in array13 { - map13 += ench.makeEnchantment(5).makeTag(); + map13 += ench.makeEnchantment(5).makeBookTag(); } var map14 as IData = {}; for ench in array14 { - map14 += ench.makeEnchantment(2).makeTag(); + map14 += ench.makeEnchantment(2).makeBookTag(); } var map15 as IData = {}; for ench in array15 { - map15 += ench.makeEnchantment(4).makeTag(); + map15 += ench.makeEnchantment(4).makeBookTag(); } var map16 as IData = {}; for ench in array16 { - map16 += ench.makeEnchantment(5).makeTag(); + map16 += ench.makeEnchantment(5).makeBookTag(); } var map17 as IData = {}; for ench in array17 { - map17 += ench.makeEnchantment(1).makeTag(); + map17 += ench.makeEnchantment(1).makeBookTag(); } var map18 as IData = {}; for ench in array18 { - map18 += ench.makeEnchantment(5).makeTag(); + map18 += ench.makeEnchantment(5).makeBookTag(); } var map31 as IData = {}; for ench in array31 { - map31 += ench.makeEnchantment(1).makeTag(); + map31 += ench.makeEnchantment(1).makeBookTag(); } var map32 as IData = {}; for ench in array32 { - map32 += ench.makeEnchantment(2).makeTag(); + map32 += ench.makeEnchantment(2).makeBookTag(); } var map50 as IData = {}; for ench in array50 { - map50 += ench.makeEnchantment(4).makeTag(); + map50 += ench.makeEnchantment(4).makeBookTag(); } var map51 as IData = {}; for ench in array51 { - map51 += ench.makeEnchantment(1).makeTag(); + map51 += ench.makeEnchantment(1).makeBookTag(); } var map52 as IData = {}; for ench in array52 { - map52 += ench.makeEnchantment(4).makeTag(); + map52 += ench.makeEnchantment(4).makeBookTag(); } var map53 as IData = {}; for ench in array53 { - map53 += ench.makeEnchantment(4).makeTag(); + map53 += ench.makeEnchantment(4).makeBookTag(); } var map54 as IData = {}; for ench in array54 { - map54 += ench.makeEnchantment(3).makeTag(); + map54 += ench.makeEnchantment(3).makeBookTag(); } var map55 as IData = {}; for ench in array55 { - map55 += ench.makeEnchantment(1).makeTag(); + map55 += ench.makeEnchantment(1).makeBookTag(); } var map56 as IData = {}; for ench in array56 { - map56 += ench.makeEnchantment(3).makeTag(); + map56 += ench.makeEnchantment(3).makeBookTag(); } var map57 as IData = {}; for ench in array57 { - map57 += ench.makeEnchantment(4).makeTag(); + map57 += ench.makeEnchantment(4).makeBookTag(); } var map58 as IData = {}; for ench in array58 { - map58 += ench.makeEnchantment(1).makeTag(); + map58 += ench.makeEnchantment(1).makeBookTag(); } var map59 as IData = {}; for ench in array59 { - map59 += ench.makeEnchantment(5).makeTag(); + map59 += ench.makeEnchantment(5).makeBookTag(); } var map60 as IData = {}; for ench in array60 { - map60 += ench.makeEnchantment(5).makeTag(); + map60 += ench.makeEnchantment(5).makeBookTag(); } var map61 as IData = {}; for ench in array61 { - map61 += ench.makeEnchantment(5).makeTag(); + map61 += ench.makeEnchantment(5).makeBookTag(); } var map62 as IData = {}; for ench in array62 { - map62 += ench.makeEnchantment(5).makeTag(); + map62 += ench.makeEnchantment(5).makeBookTag(); } var map63 as IData = {}; for ench in array63 { - map63 += ench.makeEnchantment(2).makeTag(); + map63 += ench.makeEnchantment(2).makeBookTag(); } var map64 as IData = {}; for ench in array64 { - map64 += ench.makeEnchantment(1).makeTag(); + map64 += ench.makeEnchantment(1).makeBookTag(); } var map65 as IData = {}; for ench in array65 { - map65 += ench.makeEnchantment(5).makeTag(); + map65 += ench.makeEnchantment(5).makeBookTag(); } var map66 as IData = {}; for ench in array66 { - map66 += ench.makeEnchantment(5).makeTag(); + map66 += ench.makeEnchantment(5).makeBookTag(); } var map67 as IData = {}; for ench in array67 { - map67 += ench.makeEnchantment(3).makeTag(); + map67 += ench.makeEnchantment(3).makeBookTag(); } var map68 as IData = {}; for ench in array68 { - map68 += ench.makeEnchantment(3).makeTag(); + map68 += ench.makeEnchantment(3).makeBookTag(); } var map69 as IData = {}; for ench in array69 { - map69 += ench.makeEnchantment(5).makeTag(); + map69 += ench.makeEnchantment(5).makeBookTag(); } var map70 as IData = {}; for ench in array70 { - map70 += ench.makeEnchantment(2).makeTag(); + map70 += ench.makeEnchantment(2).makeBookTag(); } var map71 as IData = {}; for ench in array71 { - map71 += ench.makeEnchantment(5).makeTag(); + map71 += ench.makeEnchantment(5).makeBookTag(); } var map72 as IData = {}; for ench in array72 { - map72 += ench.makeEnchantment(4).makeTag(); + map72 += ench.makeEnchantment(4).makeBookTag(); } var map73 as IData = {}; for ench in array73 { - map73 += ench.makeEnchantment(2).makeTag(); + map73 += ench.makeEnchantment(2).makeBookTag(); } var map74 as IData = {}; for ench in array74 { - map74 += ench.makeEnchantment(5).makeTag(); + map74 += ench.makeEnchantment(5).makeBookTag(); } var map75 as IData = {}; for ench in array75 { - map75 += ench.makeEnchantment(5).makeTag(); + map75 += ench.makeEnchantment(5).makeBookTag(); } var map76 as IData = {}; for ench in array76 { - map76 += ench.makeEnchantment(2).makeTag(); + map76 += ench.makeEnchantment(2).makeBookTag(); } var map77 as IData = {}; for ench in array77 { - map77 += ench.makeEnchantment(1).makeTag(); + map77 += ench.makeEnchantment(1).makeBookTag(); } var map78 as IData = {}; for ench in array78 { - map78 += ench.makeEnchantment(5).makeTag(); + map78 += ench.makeEnchantment(5).makeBookTag(); } var map79 as IData = {}; for ench in array79 { - map79 += ench.makeEnchantment(5).makeTag(); + map79 += ench.makeEnchantment(5).makeBookTag(); } var map80 as IData = {}; for ench in array80 { - map80 += ench.makeEnchantment(4).makeTag(); + map80 += ench.makeEnchantment(4).makeBookTag(); } var map81 as IData = {}; for ench in array81 { - map81 += ench.makeEnchantment(3).makeTag(); + map81 += ench.makeEnchantment(3).makeBookTag(); } // var map82 as IData = {}; // for ench in array82 { -// map82 += ench.makeEnchantment(1).makeTag(); +// map82 += ench.makeEnchantment(1).makeBookTag(); // } var map83 as IData = {}; for ench in array83 { - map83 += ench.makeEnchantment(4).makeTag(); + map83 += ench.makeEnchantment(4).makeBookTag(); } var map84 as IData = {}; for ench in array84 { - map84 += ench.makeEnchantment(1).makeTag(); + map84 += ench.makeEnchantment(1).makeBookTag(); } var map85 as IData = {}; for ench in array85 { - map85 += ench.makeEnchantment(5).makeTag(); + map85 += ench.makeEnchantment(5).makeBookTag(); } var map86 as IData = {}; for ench in array86 { - map86 += ench.makeEnchantment(1).makeTag(); + map86 += ench.makeEnchantment(1).makeBookTag(); } diff --git a/scripts/ModularInfusion.zs b/scripts/ModularInfusion.zs index b42ceb94..22465b85 100644 --- a/scripts/ModularInfusion.zs +++ b/scripts/ModularInfusion.zs @@ -574,3 +574,21 @@ reci55.addItemInput(); reci55.addItemInput(); reci55.addItemOutput(); reci55.build(); + +val reci56 = RecipeBuilder.newBuilder("inf56","arcane_autoinfuser",120); +reci56.addEnergyPerTickInput(100); +reci56.addItemInput(); +reci56.addItemInput(); +reci56.addItemInput(); +reci56.addItemInput(); +reci56.addItemOutput(); +reci56.build(); + +val reci57 = RecipeBuilder.newBuilder("inf57","arcane_autoinfuser",120); +reci57.addEnergyPerTickInput(100); +reci57.addItemInput(); +reci57.addItemInput(); +reci57.addItemInput(); +reci57.addItemInput(); +reci57.addItemOutput(); +reci57.build(); \ No newline at end of file diff --git a/scripts/ModularSingularities.zs b/scripts/ModularSingularities.zs index 9c909094..31092efb 100644 --- a/scripts/ModularSingularities.zs +++ b/scripts/ModularSingularities.zs @@ -517,12 +517,17 @@ quantumcondactual.addItemInput(*2048); quantumcondactual.addItemOutput(); quantumcondactual.build(); +val quantumcondchargedsignslum = RecipeBuilder.newBuilder("quantumcondchargedsignslum", "quantum_condenser", 10); +quantumcondchargedsignslum.addEnergyPerTickInput(500000); +quantumcondchargedsignslum.addItemInput(*1024); +quantumcondchargedsignslum.addItemOutput(); +quantumcondchargedsignslum.build(); + val quantumcondinsanium = RecipeBuilder.newBuilder("quantumcondinsanium", "quantum_condenser", 2); quantumcondinsanium.addEnergyPerTickInput(500000); quantumcondinsanium.addItemInput(); quantumcondinsanium.setChance(0.0); -quantumcondinsanium.addItemInput(*1024); +quantumcondinsanium.addItemInput(*1024); quantumcondinsanium.addItemOutput(); quantumcondinsanium.build(); - diff --git a/scripts/ModularSmeltery.zs b/scripts/ModularSmeltery.zs index a2db0614..50db133b 100644 --- a/scripts/ModularSmeltery.zs +++ b/scripts/ModularSmeltery.zs @@ -123,4 +123,32 @@ forgewyvactual4.addFluidOutput(*10); forgewyvactual4.build(); +val forgewyvparafrosy = RecipeBuilder.newBuilder("forgewyvparafrosy","forge_of_the_wyvern",2); +forgewyvparafrosy.addItemInput(); +forgewyvparafrosy.setChance(0.0); +forgewyvparafrosy.addItemInput(); +forgewyvparafrosy.addFluidOutput(*144); +forgewyvparafrosy.build(); + +val forgewyvhihiiro = RecipeBuilder.newBuilder("forgewyvhihiiro","forge_of_the_wyvern",2); +forgewyvhihiiro.addItemInput(); +forgewyvhihiiro.setChance(0.0); +forgewyvhihiiro.addItemInput(); +forgewyvhihiiro.addFluidOutput(*144); +forgewyvhihiiro.build(); + +val forgewyvichor = RecipeBuilder.newBuilder("forgewyvichor","forge_of_the_wyvern",2); +forgewyvichor.addItemInput(); +forgewyvichor.setChance(0.0); +forgewyvichor.addItemInput(); +forgewyvichor.addFluidOutput(*144); +forgewyvichor.build(); + +val forgewyvorichalc = RecipeBuilder.newBuilder("forgewyvorichalc","forge_of_the_wyvern",2); +forgewyvorichalc.addItemInput(); +forgewyvorichalc.setChance(0.0); +forgewyvorichalc.addItemInput(); +forgewyvorichalc.addFluidOutput(*144); +forgewyvorichalc.build(); + diff --git a/scripts/ModularSuperApiary.zs b/scripts/ModularSuperApiary.zs index 1d8a5e78..493789b2 100644 --- a/scripts/ModularSuperApiary.zs +++ b/scripts/ModularSuperApiary.zs @@ -179,9 +179,8 @@ val superbee_helium = RecipeBuilder.newBuilder("superbee_helium","sacred_cinders val superbee_flux = RecipeBuilder.newBuilder("superbee_flux","sacred_cinders_apiary",10); superbee_flux.addItemInput(.withTag({Genome: {Chromosomes: [{UID1: "gendustry.bee.Flux", UID0: "gendustry.bee.Flux"}]}})); superbee_flux.setChance(0.0); superbee_flux.addFluidInput(*25); superbee_flux.addItemOutput(*64); superbee_flux.addItemOutput(*64); superbee_flux.build(); val superbee_forlorn = RecipeBuilder.newBuilder("superbee_forlorn","sacred_cinders_apiary",10); superbee_forlorn.addItemInput(.withTag({Genome: {Chromosomes: [{UID1: "magicbees.speciesForlorn", UID0: "magicbees.speciesForlorn"}]}})); superbee_forlorn.setChance(0.0); superbee_forlorn.addFluidInput(*25); superbee_forlorn.addItemOutput(*64); superbee_forlorn.addItemOutput(*64); superbee_forlorn.build(); -val superbee_cosmicconstellation = RecipeBuilder.newBuilder("superbee_cosmicconstellation","sacred_cinders_apiary",10); superbee_cosmicconstellation.addItemInput(.withTag({Genome: {Chromosomes: [{UID1: "gendustry.bee.CosmicConstellation", UID0: "gendustry.bee.CosmicConstellation"}]}})); superbee_cosmicconstellation.setChance(0.0); superbee_cosmicconstellation.addFluidInput(*25); superbee_cosmicconstellation.addItemOutput(*64); superbee_cosmicconstellation.addItemOutput(*64); superbee_cosmicconstellation.build(); +val superbee_cosmicconstellation = RecipeBuilder.newBuilder("superbee_cosmicconstellation","sacred_cinders_apiary",10); superbee_cosmicconstellation.addItemInput(.withTag({Genome: {Chromosomes: [{UID1: "gendustry.bee.UniversalConstellation", UID0: "gendustry.bee.UniversalConstellation"}]}})); superbee_cosmicconstellation.setChance(0.0); superbee_cosmicconstellation.addFluidInput(*25); superbee_cosmicconstellation.addItemOutput(*64); superbee_cosmicconstellation.addItemOutput(*64); superbee_cosmicconstellation.build(); val superbee_treeoflife = RecipeBuilder.newBuilder("superbee_treeoflife","sacred_cinders_apiary",10); superbee_treeoflife.addItemInput(.withTag({Genome: {Chromosomes: [{UID1: "gendustry.bee.TreeOfLife", UID0: "gendustry.bee.TreeOfLife"}]}})); superbee_treeoflife.setChance(0.0); superbee_treeoflife.addFluidInput(*25); superbee_treeoflife.addItemOutput(*64); superbee_treeoflife.addItemOutput(*64); superbee_treeoflife.build(); val superbee_gallifreyan = RecipeBuilder.newBuilder("superbee_gallifreyan","sacred_cinders_apiary",10); superbee_gallifreyan.addItemInput(.withTag({Genome: {Chromosomes: [{UID1: "gendustry.bee.Gallifreyan", UID0: "gendustry.bee.Gallifreyan"}]}})); superbee_gallifreyan.setChance(0.0); superbee_gallifreyan.addFluidInput(*25); superbee_gallifreyan.addItemOutput(*64); superbee_gallifreyan.addItemOutput(*64); superbee_gallifreyan.build(); - diff --git a/scripts/ModularVoidMythical.zs b/scripts/ModularVoidMythical.zs index 76f5132a..16dd27f1 100644 --- a/scripts/ModularVoidMythical.zs +++ b/scripts/ModularVoidMythical.zs @@ -420,6 +420,7 @@ recipes.addShapeless(, []); mods.thermalexpansion.InductionSmelter.addRecipe(*2, , , 5000); +mods.nuclearcraft.alloy_furnace.addRecipe([, , *2]); val dreadcruc = RecipeBuilder.newBuilder("dreaditecrucible","dragonfire_crucible",100); dreadcruc.addFluidInput(*400); @@ -3262,4 +3263,3 @@ recipes.addShaped(, - diff --git a/scripts/ModularWormholeField.zs b/scripts/ModularWormholeField.zs new file mode 100644 index 00000000..32786e53 --- /dev/null +++ b/scripts/ModularWormholeField.zs @@ -0,0 +1,117 @@ +import mods.contenttweaker.VanillaFactory; +import crafttweaker.world.IWorld; +import mods.contenttweaker.Player; +import crafttweaker.player.IPlayer; +import crafttweaker.block.IBlock; +import mods.contenttweaker.BlockState; +import mods.contenttweaker.BlockPos; +import crafttweaker.world.IFacing; +import crafttweaker.block.IBlockState; +import mods.modularmachinery.RecipeBuilder; +import mods.modularmachinery.MachineEvent; +import mods.modularmachinery.MachineTickEvent; +import mods.modularmachinery.RecipeEvent; +import mods.modularmachinery.RecipeStartEvent; +import mods.modularmachinery.RecipeTickEvent; +import mods.modularmachinery.RecipeFinishEvent; +import mods.modularmachinery.MMEvents; +import mods.modularmachinery.IMachineController; +import mods.contenttweaker.Commands; +import crafttweaker.server.IServer; +import crafttweaker.command.ICommandManager; +import crafttweaker.command.ICommandSender; + + +//You can get an IPlayer from event.controller.ownerPlayer but it returns null if they are not online so I have done commands using server.commandManager + +//Example recipe: +var wormholetaerrapiatta = RecipeBuilder.newBuilder("wormholetaerrapiatta","wormhole_field_generator",100); +wormholetaerrapiatta.addItemInput().setChance(0); +wormholetaerrapiatta.addEnergyPerTickInput(10000); +wormholetaerrapiatta.addStartHandler(function(event as RecipeStartEvent) {wormholeGeneratorRecipeStart(event.controller, "contenttweaker:taerrapiatta_portal_block", "Taerrapiatta");}); +wormholetaerrapiatta.addRecipeTooltip("该配方在激活时会生成一个传送门。", "站在传送门中右击以进行传送。"); +wormholetaerrapiatta.build(); + +var wormholediamerisma = RecipeBuilder.newBuilder("wormholediamerisma","wormhole_field_generator",100); +wormholediamerisma.addItemInput().setChance(0); +wormholediamerisma.addEnergyPerTickInput(10000); +wormholediamerisma.addStartHandler(function(event as RecipeStartEvent) {wormholeGeneratorRecipeStart(event.controller, "contenttweaker:diamerisma_portal_block", "Diamerisma");}); +wormholediamerisma.addRecipeTooltip("该配方在激活时会生成一个传送门。", "站在传送门中右击以进行传送。"); +wormholediamerisma.build(); + +var wormholefuratto = RecipeBuilder.newBuilder("wormholefuratto","wormhole_field_generator",100); +wormholefuratto.addItemInput().setChance(0); +wormholefuratto.addEnergyPerTickInput(10000); +wormholefuratto.addStartHandler(function(event as RecipeStartEvent) {wormholeGeneratorRecipeStart(event.controller, "contenttweaker:furatto_portal_block", "Furatto");}); +wormholefuratto.addRecipeTooltip("该配方在激活时会生成一个传送门。", "站在传送门中右击以进行传送。"); +wormholefuratto.build(); + +var wormholefinem = RecipeBuilder.newBuilder("wormholefinem","wormhole_field_generator",100); +wormholefinem.addItemInput().setChance(0); +wormholefinem.addEnergyPerTickInput(10000); +wormholefinem.addStartHandler(function(event as RecipeStartEvent) {wormholeGeneratorRecipeStart(event.controller, "contenttweaker:finem_portal_block", "Finem");}); +wormholefinem.addRecipeTooltip("该配方在激活时会生成一个传送门。", "站在传送门中右击以进行传送。"); +wormholefinem.build(); + +var wormholeapichisi = RecipeBuilder.newBuilder("wormholeapichisi","wormhole_field_generator",100); +wormholeapichisi.addItemInput().setChance(0); +wormholeapichisi.addEnergyPerTickInput(10000); +wormholeapichisi.addStartHandler(function(event as RecipeStartEvent) {wormholeGeneratorRecipeStart(event.controller, "contenttweaker:apichisi_portal_block", "Apichisi");}); +wormholeapichisi.addRecipeTooltip("该配方在激活时会生成一个传送门。", "站在传送门中右击以进行传送。"); +wormholeapichisi.build(); + +var wormholelyndenwyrm = RecipeBuilder.newBuilder("wormholelyndenwyrm","wormhole_field_generator",100); +wormholelyndenwyrm.addItemInput().setChance(0); +wormholelyndenwyrm.addEnergyPerTickInput(10000); +wormholelyndenwyrm.addStartHandler(function(event as RecipeStartEvent) {wormholeGeneratorRecipeStart(event.controller, "contenttweaker:lyndenwyrm_portal_block", "Lyndenwyrm");}); +wormholelyndenwyrm.addRecipeTooltip("该配方在激活时会生成一个传送门。", "站在传送门中右击以进行传送。"); +wormholelyndenwyrm.build(); + +var wormholegallifrey = RecipeBuilder.newBuilder("wormholegallifrey","wormhole_field_generator",100); +wormholegallifrey.addItemInput().setChance(0); +wormholegallifrey.addEnergyPerTickInput(10000); +wormholegallifrey.addStartHandler(function(event as RecipeStartEvent) {wormholeGeneratorRecipeStart(event.controller, "contenttweaker:gallifrey_portal_block", "Gallifrey");}); +wormholegallifrey.addRecipeTooltip("该配方在激活时会生成一个传送门。", "站在传送门中右击以进行传送。"); +wormholegallifrey.build(); + + + + + +//Destroy potal if the controller is not running +MMEvents.onMachinePostTick("wormhole_field_generator", function(event as MachineTickEvent) { + var ctrl = event.controller; + if(!ctrl.isWorking && ctrl.world.getBlockState(ctrl.pos.getOffset(up,4).getOffset(ctrl.facing,-3)) != IBlockState.getBlockState("minecraft:air","")) { + wormholeGeneratorPlacePortal(ctrl, "minecraft:air"); + var pos = ctrl.pos.getOffset(up,4).getOffset(ctrl.facing,-3); + server.commandManager.executeCommand(server, "playsound minecraft:entity.evocation_illager.cast_spell ambient @a " + pos.x + " " + pos.y + " " + pos.z + " 1 0.5"); + server.commandManager.executeCommand(server, "particle smoke " + pos.x + " " + pos.y + " " + pos.z + " 1 1 1 0.1 200"); + server.commandManager.executeCommand(server, 'execute @a[x=' + pos.x + ',y=' + pos.y + ',z=' + pos.z + ',r=25] ~ ~ ~ tellraw @p {"text":"Wormhole Generator offline"}'); + } +}); + +//Do start up sound and message if no current portal, spawn portal if different recipe, or nothing if same portal: +function wormholeGeneratorRecipeStart(controller as IMachineController, portalBlock as string, destination as string) { + var pos = controller.pos.getOffset(up,4).getOffset(controller.facing,-3); + var currentPortalBlock = controller.world.getBlockState(pos); + + if (currentPortalBlock != IBlockState.getBlockState(portalBlock,"")) { + if (currentPortalBlock == IBlockState.getBlockState("minecraft:air","")) { + server.commandManager.executeCommand(server, "playsound minecraft:entity.evocation_illager.prepare_summon ambient @a " + pos.x + " " + pos.y + " " + pos.z + " 1 1"); + server.commandManager.executeCommand(server, 'execute @a[x=' + pos.x + ',y=' + pos.y + ',z=' + pos.z + ',r=25] ~ ~ ~ tellraw @p {"text":"Wormhole Generator online"}'); + } + wormholeGeneratorPlacePortal(controller, portalBlock); + server.commandManager.executeCommand(server, "playsound minecraft:block.portal.trigger block @a " + pos.x + " " + pos.y + " " + pos.z + " 1 1"); + server.commandManager.executeCommand(server, "particle portal " + pos.x + " " + pos.y + " " + pos.z + " 1 1 1 0.1 1000"); + server.commandManager.executeCommand(server, 'execute @a[x=' + pos.x + ',y=' + pos.y + ',z=' + pos.z + ',r=25] ~ ~ ~ tellraw @p {"text":"Current destination: ' + destination + '"}'); + } +} + +//places portal blocks inside the stargate ring: +function wormholeGeneratorPlacePortal(controller as IMachineController, portalBlock as string) { + var facing = controller.facing; + var pos = controller.pos.getOffset(up,4).getOffset(facing,-3); + server.commandManager.executeCommand(server, "fill " + (pos.x - 1) + " " + (pos.y - 1) + " " + (pos.z - 1) + " " + (pos.x + 1) + " " + (pos.y + 1) + " " + (pos.z + 1) + " " + portalBlock); +} + + diff --git a/scripts/ModularXPAssimilator.zs b/scripts/ModularXPAssimilator.zs new file mode 100644 index 00000000..c47ea97a --- /dev/null +++ b/scripts/ModularXPAssimilator.zs @@ -0,0 +1,283 @@ +import mods.modularmachinery.RecipeBuilder; +import mods.modularmachinery.RecipeEvent; +import mods.modularmachinery.MachineEvent; +import mods.modularmachinery.RecipeCheckEvent; +import mods.modularmachinery.RecipeFinishEvent; +import mods.modularmachinery.IMachineController; +import mods.contenttweaker.Commands; +import crafttweaker.server.IServer; +import crafttweaker.command.ICommandManager; +import crafttweaker.command.ICommandSender; + + +recipes.addShaped(.withTag({FluidName: "bewitched_essence_salts", Amount: 1000}), +[[, , ], +[, .withTag({FluidName: "mana", Amount: 1000}), ], +[, , ]]); + +recipes.addShaped(.withTag({display: {Lore: ["§d§o1X§r"]}}), +[[, , ], +[, , ], +[, , ]]); + +mods.chisel.Carving.addGroup("experienceconfig"); +mods.chisel.Carving.addVariation("experienceconfig", .withTag({display: {Lore: ["§d§o1X§r"]}})); +mods.chisel.Carving.addVariation("experienceconfig", .withTag({display: {Lore: ["§d§o64X§r"]}})); +mods.chisel.Carving.addVariation("experienceconfig", .withTag({display: {Lore: ["§d§o256X§r"]}})); +mods.chisel.Carving.addVariation("experienceconfig", .withTag({display: {Lore: ["§d§o1024X§r"]}})); + + + +var addxpsolidified1 = RecipeBuilder.newBuilder("addxpsolidified1","xp_assimilator",5); +addxpsolidified1.addItemInput(); +addxpsolidified1.addItemInput(.withTag({display: {Lore: ["§d§o1X§r"]}})); +addxpsolidified1.setChance(0.0); +addxpsolidified1.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpsolidified1.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 8 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpsolidified1.addRecipeTooltip("8 xp：站在池子中控制器正上方的位置"); +addxpsolidified1.build(); + +var addxpsolidified2 = RecipeBuilder.newBuilder("addxpsolidified2","xp_assimilator",5); +addxpsolidified2.addItemInput(*64); +addxpsolidified2.addItemInput(.withTag({display: {Lore: ["§d§o64X§r"]}})); +addxpsolidified2.setChance(0.0); +addxpsolidified2.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpsolidified2.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 512 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpsolidified2.addRecipeTooltip("512 xp：站在池子中控制器正上方的位置"); +addxpsolidified2.build(); + +var addxpsolidified3 = RecipeBuilder.newBuilder("addxpsolidified3","xp_assimilator",5); +addxpsolidified3.addItemInput(*256); +addxpsolidified3.addItemInput(.withTag({display: {Lore: ["§d§o256X§r"]}})); +addxpsolidified3.setChance(0.0); +addxpsolidified3.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpsolidified3.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 2048 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpsolidified3.addRecipeTooltip("2048 xp：站在池子中控制器正上方的位置"); +addxpsolidified3.build(); + +var addxpsolidified4 = RecipeBuilder.newBuilder("addxpsolidified4","xp_assimilator",5); +addxpsolidified4.addItemInput(*1024); +addxpsolidified4.addItemInput(.withTag({display: {Lore: ["§d§o1024X§r"]}})); +addxpsolidified4.setChance(0.0); +addxpsolidified4.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpsolidified4.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 8196 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpsolidified4.addRecipeTooltip("8192 xp：站在池子中控制器正上方的位置"); +addxpsolidified4.build(); + + + +var addxpoverworldian1 = RecipeBuilder.newBuilder("addxpoverworldian1","xp_assimilator",5); +addxpoverworldian1.addItemInput(); +addxpoverworldian1.addItemInput(.withTag({display: {Lore: ["§d§o1X§r"]}})); +addxpoverworldian1.setChance(0.0); +addxpoverworldian1.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpoverworldian1.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 10 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpoverworldian1.addRecipeTooltip("10 xp：站在池子中控制器正上方的位置"); +addxpoverworldian1.build(); + +var addxpoverworldian2 = RecipeBuilder.newBuilder("addxpoverworldian2","xp_assimilator",5); +addxpoverworldian2.addItemInput(*64); +addxpoverworldian2.addItemInput(.withTag({display: {Lore: ["§d§o64X§r"]}})); +addxpoverworldian2.setChance(0.0); +addxpoverworldian2.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpoverworldian2.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 640 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpoverworldian2.addRecipeTooltip("640 xp：站在池子中控制器正上方的位置"); +addxpoverworldian2.build(); + +var addxpoverworldian3 = RecipeBuilder.newBuilder("addxpoverworldian3","xp_assimilator",5); +addxpoverworldian3.addItemInput(*256); +addxpoverworldian3.addItemInput(.withTag({display: {Lore: ["§d§o256X§r"]}})); +addxpoverworldian3.setChance(0.0); +addxpoverworldian3.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpoverworldian3.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 2560 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpoverworldian3.addRecipeTooltip("2560 xp：站在池子中控制器正上方的位置"); +addxpoverworldian3.build(); + +var addxpoverworldian4 = RecipeBuilder.newBuilder("addxpoverworldian4","xp_assimilator",5); +addxpoverworldian4.addItemInput(*1024); +addxpoverworldian4.addItemInput(.withTag({display: {Lore: ["§d§o1024X§r"]}})); +addxpoverworldian4.setChance(0.0); +addxpoverworldian4.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpoverworldian4.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 10240 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpoverworldian4.addRecipeTooltip("10240 xp：站在池子中控制器正上方的位置"); +addxpoverworldian4.build(); + + + + +var addxphellish1 = RecipeBuilder.newBuilder("addxphellish1","xp_assimilator",5); +addxphellish1.addItemInput(); +addxphellish1.addItemInput(.withTag({display: {Lore: ["§d§o1X§r"]}})); +addxphellish1.setChance(0.0); +addxphellish1.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxphellish1.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 14 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxphellish1.addRecipeTooltip("14 xp：站在池子中控制器正上方的位置"); +addxphellish1.build(); + +var addxphellish2 = RecipeBuilder.newBuilder("addxphellish2","xp_assimilator",5); +addxphellish2.addItemInput(*64); +addxphellish2.addItemInput(.withTag({display: {Lore: ["§d§o64X§r"]}})); +addxphellish2.setChance(0.0); +addxphellish2.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxphellish2.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 896 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxphellish2.addRecipeTooltip("896 xp：站在池子中控制器正上方的位置"); +addxphellish2.build(); + +var addxphellish3 = RecipeBuilder.newBuilder("addxphellish3","xp_assimilator",5); +addxphellish3.addItemInput(*256); +addxphellish3.addItemInput(.withTag({display: {Lore: ["§d§o256X§r"]}})); +addxphellish3.setChance(0.0); +addxphellish3.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxphellish3.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 3584 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxphellish3.addRecipeTooltip("3584 xp：站在池子中控制器正上方的位置"); +addxphellish3.build(); + +var addxphellish4 = RecipeBuilder.newBuilder("addxphellish4","xp_assimilator",5); +addxphellish4.addItemInput(*1024); +addxphellish4.addItemInput(.withTag({display: {Lore: ["§d§o1024X§r"]}})); +addxphellish4.setChance(0.0); +addxphellish4.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxphellish4.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 14336 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxphellish4.addRecipeTooltip("14336 xp：站在池子中控制器正上方的位置"); +addxphellish4.build(); + + + + + +var addxpextraterr1 = RecipeBuilder.newBuilder("addxpextraterr1","xp_assimilator",5); +addxpextraterr1.addItemInput(); +addxpextraterr1.addItemInput(.withTag({display: {Lore: ["§d§o1X§r"]}})); +addxpextraterr1.setChance(0.0); +addxpextraterr1.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpextraterr1.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 20 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpextraterr1.addRecipeTooltip("20 xp：站在池子中控制器正上方的位置"); +addxpextraterr1.build(); + +var addxpextraterr2 = RecipeBuilder.newBuilder("addxpextraterr2","xp_assimilator",5); +addxpextraterr2.addItemInput(*64); +addxpextraterr2.addItemInput(.withTag({display: {Lore: ["§d§o64X§r"]}})); +addxpextraterr2.setChance(0.0); +addxpextraterr2.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpextraterr2.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 1280 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpextraterr2.addRecipeTooltip("1280 xp：站在池子中控制器正上方的位置"); +addxpextraterr2.build(); + +var addxpextraterr3 = RecipeBuilder.newBuilder("addxpextraterr3","xp_assimilator",5); +addxpextraterr3.addItemInput(*256); +addxpextraterr3.addItemInput(.withTag({display: {Lore: ["§d§o256X§r"]}})); +addxpextraterr3.setChance(0.0); +addxpextraterr3.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpextraterr3.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 5120 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpextraterr3.addRecipeTooltip("5120 xp：站在池子中控制器正上方的位置"); +addxpextraterr3.build(); + +var addxpextraterr4 = RecipeBuilder.newBuilder("addxpextraterr4","xp_assimilator",5); +addxpextraterr4.addItemInput(*1024); +addxpextraterr4.addItemInput(.withTag({display: {Lore: ["§d§o1024X§r"]}})); +addxpextraterr4.setChance(0.0); +addxpextraterr4.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpextraterr4.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 20480 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpextraterr4.addRecipeTooltip("20480 xp：站在池子中控制器正上方的位置"); +addxpextraterr4.build(); + + + +var addxptwilight1 = RecipeBuilder.newBuilder("addxptwilight1","xp_assimilator",5); +addxptwilight1.addItemInput(); +addxptwilight1.addItemInput(.withTag({display: {Lore: ["§d§o1X§r"]}})); +addxptwilight1.setChance(0.0); +addxptwilight1.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxptwilight1.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 30 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxptwilight1.addRecipeTooltip("30 xp：站在池子中控制器正上方的位置"); +addxptwilight1.build(); + +var addxptwilight2 = RecipeBuilder.newBuilder("addxptwilight2","xp_assimilator",5); +addxptwilight2.addItemInput(*64); +addxptwilight2.addItemInput(.withTag({display: {Lore: ["§d§o64X§r"]}})); +addxptwilight2.setChance(0.0); +addxptwilight2.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxptwilight2.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 1920 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxptwilight2.addRecipeTooltip("1920 xp：站在池子中控制器正上方的位置"); +addxptwilight2.build(); + +var addxptwilight3 = RecipeBuilder.newBuilder("addxptwilight3","xp_assimilator",5); +addxptwilight3.addItemInput(*256); +addxptwilight3.addItemInput(.withTag({display: {Lore: ["§d§o256X§r"]}})); +addxptwilight3.setChance(0.0); +addxptwilight3.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxptwilight3.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 7680 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxptwilight3.addRecipeTooltip("7680 xp：站在池子中控制器正上方的位置"); +addxptwilight3.build(); + +var addxptwilight4 = RecipeBuilder.newBuilder("addxptwilight4","xp_assimilator",5); +addxptwilight4.addItemInput(*1024); +addxptwilight4.addItemInput(.withTag({display: {Lore: ["§d§o1024X§r"]}})); +addxptwilight4.setChance(0.0); +addxptwilight4.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxptwilight4.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 30720 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxptwilight4.addRecipeTooltip("30720 xp：站在池子中控制器正上方的位置"); +addxptwilight4.build(); + + + + + +var addxpbeessence1 = RecipeBuilder.newBuilder("addxpbeessence1","xp_assimilator",5); +addxpbeessence1.addItemInput(); +addxpbeessence1.addItemInput(.withTag({display: {Lore: ["§d§o1X§r"]}})); +addxpbeessence1.setChance(0.0); +addxpbeessence1.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpbeessence1.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 1000 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpbeessence1.addRecipeTooltip("1000 xp：站在池子中控制器正上方的位置"); +addxpbeessence1.build(); + +var addxpbeessence2 = RecipeBuilder.newBuilder("addxpbeessence2","xp_assimilator",5); +addxpbeessence2.addItemInput(*64); +addxpbeessence2.addItemInput(.withTag({display: {Lore: ["§d§o64X§r"]}})); +addxpbeessence2.setChance(0.0); +addxpbeessence2.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpbeessence2.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 64000 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpbeessence2.addRecipeTooltip("64000 xp：站在池子中控制器正上方的位置"); +addxpbeessence2.build(); + +var addxpbeessence3 = RecipeBuilder.newBuilder("addxpbeessence3","xp_assimilator",5); +addxpbeessence3.addItemInput(*256); +addxpbeessence3.addItemInput(.withTag({display: {Lore: ["§d§o256X§r"]}})); +addxpbeessence3.setChance(0.0); +addxpbeessence3.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpbeessence3.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 256000 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpbeessence3.addRecipeTooltip("256000 xp：站在池子中控制器正上方的位置"); +addxpbeessence3.build(); + +var addxpbeessence4 = RecipeBuilder.newBuilder("addxpbeessence4","xp_assimilator",5); +addxpbeessence4.addItemInput(*1024); +addxpbeessence4.addItemInput(.withTag({display: {Lore: ["§d§o1024X§r"]}})); +addxpbeessence4.setChance(0.0); +addxpbeessence4.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +addxpbeessence4.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 1024000 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +addxpbeessence4.addRecipeTooltip("1024000 xp：站在池子中控制器正上方的位置"); +addxpbeessence4.build(); + + + +var cyfluid = RecipeBuilder.newBuilder("xpa_cyclic_experience","xp_assimilator",5); +cyfluid.addFluidInput( * 1000); +cyfluid.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +cyfluid.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 50 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +cyfluid.addRecipeTooltip("50 xp：站在池子中控制器正上方的位置"); +cyfluid.build(); + +var iffluid = RecipeBuilder.newBuilder("xpa_industrial_foregoing_essence","xp_assimilator",5); +iffluid.addFluidInput( * 1000); +iffluid.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +iffluid.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 50 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +iffluid.addRecipeTooltip("50 xp：站在池子中控制器正上方的位置"); +iffluid.build(); + +var tffluid = RecipeBuilder.newBuilder("xpa_thermal_foundation_essence_of_knowledge","xp_assimilator",5); +tffluid.addFluidInput( * 1000); +tffluid.addPostCheckHandler(function(event as RecipeCheckEvent) { if (server.commandManager.executeCommand(server,"testfor @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + ",r=2]") == 0) {event.setFailed("附近无玩家");} } ); +tffluid.addFinishHandler(function(event as RecipeFinishEvent) { server.commandManager.executeCommand(server,"xp 50 @p[x=" + event.controller.pos.x + ",y=" + event.controller.pos.y + ",z=" + event.controller.pos.z + "]"); } ); +tffluid.addRecipeTooltip("50 xp：站在池子中控制器正上方的位置"); +tffluid.build(); \ No newline at end of file diff --git a/scripts/MythicProcessorAlloys.zs b/scripts/MythicProcessorAlloys.zs index e73ea395..516e6da5 100644 --- a/scripts/MythicProcessorAlloys.zs +++ b/scripts/MythicProcessorAlloys.zs @@ -608,7 +608,7 @@ mythallo82.build(); val mythallo83 = RecipeBuilder.newBuilder("mythallo83","mythic_processor_alloy_furnace",2); mythallo83.addEnergyPerTickInput(80000); mythallo83.addItemInput(); -mythallo83.addItemInput(); +mythallo83.addItemInput(*2); mythallo83.addItemOutput(); mythallo83.build(); @@ -630,7 +630,7 @@ val mythallo86 = RecipeBuilder.newBuilder("mythallo86","mythic_processor_alloy_f mythallo86.addEnergyPerTickInput(80000); mythallo86.addItemInput(); mythallo86.addItemInput(); -mythallo86.addItemOutput(*3); +mythallo86.addItemOutput(*3); mythallo86.build(); val mythallo87 = RecipeBuilder.newBuilder("mythallo87","mythic_processor_alloy_furnace",2); @@ -954,4 +954,4 @@ mythallo130.addItemInput(*4); mythallo130.addItemInput(*4); mythallo130.addItemInput(*4); mythallo130.addItemOutput(); -mythallo130.build(); +mythallo130.build(); \ No newline at end of file diff --git a/scripts/NewPortals.zs b/scripts/NewPortals.zs index 826928f2..5f947d63 100644 --- a/scripts/NewPortals.zs +++ b/scripts/NewPortals.zs @@ -1,7 +1,6 @@ import mods.thaumcraft.Infusion; import mods.modularmachinery.RecipeBuilder; -recipes.removeShaped(); mods.extendedcrafting.TableCrafting.addShaped(, [[, , ], @@ -21,15 +20,7 @@ mods.techreborn.rollingMachine.addShaped(, [, , ], [, , ]]); -recipes.addShaped(, -[[, , ], -[, , ], -[, , ]]); -recipes.addShaped(, -[[, , ], -[, , ], -[, , ]]); mods.thaumcraft.Infusion.registerRecipe("precasiainfusion", "", , diff --git a/scripts/ParallelEarths.zs b/scripts/ParallelEarths.zs index 98d033f9..79117963 100644 --- a/scripts/ParallelEarths.zs +++ b/scripts/ParallelEarths.zs @@ -14,6 +14,35 @@ import mods.contenttweaker.Player; import crafttweaker.player.IPlayer; import crafttweaker.block.IBlock; import crafttweaker.data.IData; +import crafttweaker.util.Position3f; +import crafttweaker.block.IBlockState; + + + + +function getBlockMatchAtPosition(blockTargetID as string, playerPos as crafttweaker.util.Position3f, blockLocation as int [], world as crafttweaker.world.IWorld) as int{ + // 1 if block matches, 0 if not + var match = 0 as int; + // get block position from relative to world coordinates + var checkPos as crafttweaker.util.Position3f; + checkPos = crafttweaker.util.Position3f.create(playerPos.x + blockLocation[0], playerPos.y + blockLocation[1], playerPos.z + blockLocation[2]); + // get block id at coordinates + val state = world.getBlock(checkPos); + val blockID = state.definition.id as string; + val blockMeta = state.meta; + val fullBlockID = blockMeta == 0 ? blockID : blockID + ":" + blockMeta; + // check if block id matches + if (fullBlockID == blockTargetID){ + match = 1; + } + return match; +} + + + + + + var wormholecatalyst = VanillaFactory.createItem("wormhole_catalyst"); @@ -24,63 +53,272 @@ wormholecatalyst.register(); var taerrapiattawarper = VanillaFactory.createItem("taerrapiatta_warper"); taerrapiattawarper.maxStackSize = 1; taerrapiattawarper.glowing = true; -taerrapiattawarper.itemRightClick = function(stack, world, player, hand) { - Commands.call("cofh tpx @p 180", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); -return "Pass"; -}; taerrapiattawarper.register(); var diamerismawarper = VanillaFactory.createItem("diamerisma_warper"); diamerismawarper.maxStackSize = 1; diamerismawarper.glowing = true; -diamerismawarper.itemRightClick = function(stack, world, player, hand) { - Commands.call("cofh tpx @p 181", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); -return "Pass"; -}; diamerismawarper.register(); var furattowarper = VanillaFactory.createItem("furatto_warper"); furattowarper.maxStackSize = 1; furattowarper.glowing = true; -furattowarper.itemRightClick = function(stack, world, player, hand) { - Commands.call("cofh tpx @p 182", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); -return "Pass"; -}; furattowarper.register(); +var finemwarper = VanillaFactory.createItem("finem_warper"); +finemwarper.maxStackSize = 1; +finemwarper.glowing = true; +finemwarper.register(); + +var apichisiwarper = VanillaFactory.createItem("apichisi_warper"); +apichisiwarper.maxStackSize = 1; +apichisiwarper.glowing = true; +apichisiwarper.register(); + var vibewarper = VanillaFactory.createItem("vibe_warper"); vibewarper.maxStackSize = 1; vibewarper.glowing = true; vibewarper.itemRightClick = function(stack, world, player, hand) { + + if(world.remote) { + return "FAIL"; + } + + // counter for fails or successes + var matchGen = 0 as int; + + // player position + var playerPos = player.position.asPosition3f(); + playerPos.x = playerPos.x; + playerPos.y = playerPos.y - 1; + playerPos.z = playerPos.z; + + // go through all blocks in the momument + + + if (getBlockMatchAtPosition("aoa3:ancient_rock", playerPos, [0,0,0], world) == 0) { + player.sendChat("缺少远古岩石：[0,0,0]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("aoa3:ancient_rock", playerPos, [1,0,0], world) == 0) { + player.sendChat("缺少远古岩石：[1,0,0]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("aoa3:ancient_rock", playerPos, [-1,0,0], world) == 0) { + player.sendChat("缺少远古岩石：[-1,0,0]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("aoa3:ancient_rock", playerPos, [0,0,1], world) == 0) { + player.sendChat("缺少远古岩石：[0,0,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("aoa3:ancient_rock", playerPos, [0,0,-1], world) == 0) { + player.sendChat("缺少远古岩石：[0,0,-1]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("aoa3:ancient_rock", playerPos, [2,0,0], world) == 0) { + player.sendChat("缺少远古岩石：[2,0,0]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("aoa3:ancient_rock", playerPos, [-2,0,0], world) == 0) { + player.sendChat("缺少远古岩石：[-2,0,0]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("aoa3:ancient_rock", playerPos, [0,0,2], world) == 0) { + player.sendChat("缺少远古岩石：[0,0,2]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("aoa3:ancient_rock", playerPos, [0,0,-2], world) == 0) { + player.sendChat("缺少远古岩石：[0,0,-2]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [1,0,1], world) == 0) { + player.sendChat("缺少奥术石砖：[1,0,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [-1,0,1], world) == 0) { + player.sendChat("缺少奥术石砖：[-1,0,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [1,0,-1], world) == 0) { + player.sendChat("缺少奥术石砖：[1,0,-1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [-1,0,-1], world) == 0) { + player.sendChat("缺少奥术石砖：[-1,0,-1]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [2,0,1], world) == 0) { + player.sendChat("缺少奥术石砖：[2,0,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [2,0,-1], world) == 0) { + player.sendChat("缺少奥术石砖：[2,0,-1]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [-2,0,1], world) == 0) { + player.sendChat("缺少奥术石砖：[-2,0,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [-2,0,-1], world) == 0) { + player.sendChat("缺少奥术石砖：[-2,0,-1]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [1,0,2], world) == 0) { + player.sendChat("缺少奥术石砖：[1,0,2]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [-1,0,2], world) == 0) { + player.sendChat("缺少奥术石砖：[-1,0,2]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [1,0,-2], world) == 0) { + player.sendChat("缺少奥术石砖：[1,0,-2]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [-1,0,-2], world) == 0) { + player.sendChat("缺少奥术石砖：[-1,0,-2]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [3,0,1], world) == 0) { + player.sendChat("缺少奥术石砖：[3,0,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [3,0,-1], world) == 0) { + player.sendChat("缺少奥术石砖：[3,0,-1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [3,0,0], world) == 0) { + player.sendChat("缺少奥术石砖：[3,0,0]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [-3,0,1], world) == 0) { + player.sendChat("缺少奥术石砖：[-3,0,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [-3,0,-1], world) == 0) { + player.sendChat("缺少奥术石砖：[-3,0,-1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [-3,0,0], world) == 0) { + player.sendChat("缺少奥术石砖：[-3,0,0]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [1,0,3], world) == 0) { + player.sendChat("缺少奥术石砖：[1,0,3]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [-1,0,3], world) == 0) { + player.sendChat("缺少奥术石砖：[-1,0,3]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [0,0,3], world) == 0) { + player.sendChat("缺少奥术石砖：[0,0,3]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [1,0,-3], world) == 0) { + player.sendChat("缺少奥术石砖：[1,0,-3]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [-1,0,-3], world) == 0) { + player.sendChat("缺少奥术石砖：[-1,0,-3]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [0,0,-3], world) == 0) { + player.sendChat("缺少奥术石砖：[0,0,-3]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [3,1,1], world) == 0) { + player.sendChat("缺少奥术石砖：[3,1,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [3,1,-1], world) == 0) { + player.sendChat("缺少奥术石砖：[3,1,-1]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [-3,1,1], world) == 0) { + player.sendChat("缺少奥术石砖：[-3,1,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [-3,1,-1], world) == 0) { + player.sendChat("缺少奥术石砖：[-3,1,-1]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [1,1,3], world) == 0) { + player.sendChat("缺少奥术石砖：[1,1,3]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [-1,1,3], world) == 0) { + player.sendChat("缺少奥术石砖：[-1,1,3]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [1,1,-3], world) == 0) { + player.sendChat("缺少奥术石砖：[1,1,-3]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:stone_arcane_brick", playerPos, [-1,1,-3], world) == 0) { + player.sendChat("缺少奥术石砖：[-1,1,-3]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:metal_alchemical_advanced", playerPos, [3,2,1], world) == 0) { + player.sendChat("缺少高级炼金构材：[3,2,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:metal_alchemical_advanced", playerPos, [3,2,-1], world) == 0) { + player.sendChat("缺少高级炼金构材：[3,2,-1]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:metal_alchemical_advanced", playerPos, [-3,2,1], world) == 0) { + player.sendChat("缺少高级炼金构材：[-3,2,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:metal_alchemical_advanced", playerPos, [-3,2,-1], world) == 0) { + player.sendChat("缺少高级炼金构材：[-3,2,-1]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:metal_alchemical_advanced", playerPos, [1,2,3], world) == 0) { + player.sendChat("缺少高级炼金构材：[1,2,3]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:metal_alchemical_advanced", playerPos, [-1,2,3], world) == 0) { + player.sendChat("缺少高级炼金构材：[-1,2,3]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("thaumcraft:metal_alchemical_advanced", playerPos, [1,2,-3], world) == 0) { + player.sendChat("缺少高级炼金构材：[1,2,-3]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("thaumcraft:metal_alchemical_advanced", playerPos, [-1,2,-3], world) == 0) { + player.sendChat("缺少高级炼金构材：[-1,2,-3]"); + return "FAIL"; + } + Commands.call("cofh tpx @p 183", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); -return "Pass"; + Commands.call("summon ebwizardry:blizzard", player, world, true, true); + return "Pass"; + }; vibewarper.register(); -var apichisiwarper = VanillaFactory.createItem("apichisi_warper"); -apichisiwarper.maxStackSize = 1; -apichisiwarper.glowing = true; -apichisiwarper.itemRightClick = function(stack, world, player, hand) { - Commands.call("cofh tpx @p 184", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); -return "Pass"; -}; -apichisiwarper.register(); - -var finemwarper = VanillaFactory.createItem("finem_warper"); -finemwarper.maxStackSize = 1; -finemwarper.glowing = true; -finemwarper.itemRightClick = function(stack, world, player, hand) { - Commands.call("cofh tpx @p 185", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); -return "Pass"; -}; -finemwarper.register(); - var imstuckgetmehome = VanillaFactory.createItem("imstuck_getmehome"); imstuckgetmehome.maxStackSize = 1; @@ -103,7 +341,7 @@ imstuckgetmehome.itemRightClick = function(stack, world, player, hand) { } } } - Commands.call("cofh tpx @p 0", player, world, true, true); + Commands.call("spawn", player, world, true, true); return "Pass"; }; imstuckgetmehome.register(); @@ -113,65 +351,232 @@ flintandfurnace.maxStackSize = 1; flintandfurnace.glowing = true; flintandfurnace.itemRightClick = function(stack, world, player, hand) { +if(world.remote) { + return "FAIL"; +} + player.sendChat("在主世界使用以进入熔炉维度"); player.sendChat("在熔炉维度使用该物品以返回"); if(player.getDimension() == 0) { -// obtain position under player - var pos = player.position.asPosition3f(); + // counter for fails or successes + var matchGen = 0 as int; - // check if player is standing on beacon - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - if(blockBelow != ) { - player.sendChat("站在圆石上"); + // player position + var playerPos = player.position.asPosition3f(); + playerPos.x = playerPos.x; + playerPos.y = playerPos.y - 1; + playerPos.z = playerPos.z; + + // go through all blocks in the momument + + + if (getBlockMatchAtPosition("minecraft:coal_block", playerPos, [0,0,0], world) == 0) { + player.sendChat("缺少煤炭块：[0,0,0]"); return "FAIL"; } - var posfurnace1 = player.position.asPosition3f(); - posfurnace1.y = pos.y - 1; - posfurnace1.x = pos.x - 1; - var blockposfurnace1 = posfurnace1.asBlockPos(); - var blockBelow1 = world.getBlockState(posfurnace1); - if(blockBelow1 != ) { - player.sendChat("在圆石周围放置四个煤炭块"); + + if (getBlockMatchAtPosition("minecraft:coal_block", playerPos, [1,0,0], world) == 0) { + player.sendChat("缺少煤炭块：[1,0,0]"); return "FAIL"; } - var posfurnace2 = player.position.asPosition3f(); - posfurnace2.y = pos.y - 1; - posfurnace2.x = pos.x + 1; - var blockposfurnace2 = posfurnace2.asBlockPos(); - var blockBelow2 = world.getBlockState(posfurnace2); - if(blockBelow2 != ) { - player.sendChat("在圆石周围放置四个煤炭块"); + if (getBlockMatchAtPosition("minecraft:coal_block", playerPos, [-1,0,0], world) == 0) { + player.sendChat("缺少煤炭块：[-1,0,0]"); return "FAIL"; } - var posfurnace3 = player.position.asPosition3f(); - posfurnace3.y = pos.y - 1; - posfurnace3.z = pos.z + 1; - var blockposfurnace3 = posfurnace3.asBlockPos(); - var blockBelow3 = world.getBlockState(posfurnace3); - if(blockBelow3 != ) { - player.sendChat("在圆石周围放置四个煤炭块"); + if (getBlockMatchAtPosition("minecraft:coal_block", playerPos, [0,0,1], world) == 0) { + player.sendChat("缺少煤炭块：[0,0,1]"); return "FAIL"; } - var posfurnace4 = player.position.asPosition3f(); - posfurnace4.z = pos.z - 1; - posfurnace4.y = pos.y - 1; - var blockposfurnace4 = posfurnace3.asBlockPos(); - var blockBelow4 = world.getBlockState(posfurnace4); - if(blockBelow4 != ) { - player.sendChat("在圆石周围放置四个煤炭块"); + if (getBlockMatchAtPosition("minecraft:coal_block", playerPos, [0,0,-1], world) == 0) { + player.sendChat("缺少煤炭块：[0,0,-1]"); return "FAIL"; } + + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [2,0,0], world) == 0) { + player.sendChat("缺少三重压缩圆石：[2,0,0]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [-2,0,0], world) == 0) { + player.sendChat("缺少三重压缩圆石：[-2,0,0]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [0,0,2], world) == 0) { + player.sendChat("缺少三重压缩圆石：[0,0,2]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [0,0,-2], world) == 0) { + player.sendChat("缺少三重压缩圆石：[0,0,-2]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [3,0,0], world) == 0) { + player.sendChat("缺少三重压缩圆石：[3,0,0]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [-3,0,0], world) == 0) { + player.sendChat("缺少三重压缩圆石：[-3,0,0]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [0,0,3], world) == 0) { + player.sendChat("缺少三重压缩圆石：[0,0,3]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [0,0,-3], world) == 0) { + player.sendChat("缺少三重压缩圆石：[0,0,-3]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [4,0,0], world) == 0) { + player.sendChat("缺少三重压缩圆石：[4,0,0]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [-4,0,0], world) == 0) { + player.sendChat("缺少三重压缩圆石：[-4,0,0]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [0,0,4], world) == 0) { + player.sendChat("缺少三重压缩圆石：[0,0,4]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [0,0,-4], world) == 0) { + player.sendChat("缺少三重压缩圆石：[0,0,-4]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [5,0,0], world) == 0) { + player.sendChat("缺少三重压缩圆石：[5,0,0]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [-5,0,0], world) == 0) { + player.sendChat("缺少三重压缩圆石：[-5,0,0]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [0,0,5], world) == 0) { + player.sendChat("缺少三重压缩圆石：[0,0,5]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [0,0,-5], world) == 0) { + player.sendChat("缺少三重压缩圆石：[0,0,-5]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [1,0,1], world) == 0) { + player.sendChat("缺少三重压缩圆石：[1,0,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [-1,0,1], world) == 0) { + player.sendChat("缺少三重压缩圆石：[-1,0,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [1,0,-1], world) == 0) { + player.sendChat("缺少三重压缩圆石：[1,0,-1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [-1,0,-1], world) == 0) { + player.sendChat("缺少三重压缩圆石：[-1,0,-1]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [2,0,1], world) == 0) { + player.sendChat("缺少三重压缩圆石：[2,0,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [2,0,-1], world) == 0) { + player.sendChat("缺少三重压缩圆石：[2,0,-1]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [-2,0,1], world) == 0) { + player.sendChat("缺少三重压缩圆石：[-2,0,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [-2,0,-1], world) == 0) { + player.sendChat("缺少三重压缩圆石：[-2,0,-1]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [1,0,2], world) == 0) { + player.sendChat("缺少三重压缩圆石：[1,0,2]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [-1,0,2], world) == 0) { + player.sendChat("缺少三重压缩圆石：[-1,0,2]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [1,0,-2], world) == 0) { + player.sendChat("缺少三重压缩圆石：[1,0,-2]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [-1,0,-2], world) == 0) { + player.sendChat("缺少三重压缩圆石：[-1,0,-2]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [3,0,1], world) == 0) { + player.sendChat("缺少三重压缩圆石：[3,0,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [3,0,-1], world) == 0) { + player.sendChat("缺少三重压缩圆石：[3,0,-1]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [-3,0,1], world) == 0) { + player.sendChat("缺少三重压缩圆石：[-3,0,1]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [-3,0,-1], world) == 0) { + player.sendChat("缺少三重压缩圆石：[-3,0,-1]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [1,0,3], world) == 0) { + player.sendChat("缺少三重压缩圆石：[1,0,3]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [-1,0,3], world) == 0) { + player.sendChat("缺少三重压缩圆石：[-1,0,3]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [1,0,-3], world) == 0) { + player.sendChat("缺少三重压缩圆石：[1,0,-3]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:2", playerPos, [-1,0,-3], world) == 0) { + player.sendChat("缺少三重压缩圆石：[-1,0,-3]"); + return "FAIL"; + } + + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:3", playerPos, [2,1,0], world) == 0) { + player.sendChat("缺少四重压缩圆石：[2,1,0]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:3", playerPos, [-2,1,0], world) == 0) { + player.sendChat("缺少四重压缩圆石：[-2,1,0]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:3", playerPos, [0,1,2], world) == 0) { + player.sendChat("缺少四重压缩圆石：[0,1,2]"); + return "FAIL"; + } + if (getBlockMatchAtPosition("extrautils2:compressedcobblestone:3", playerPos, [0,1,-2], world) == 0) { + player.sendChat("缺少四重压缩圆石：[0,1,-2]"); + return "FAIL"; + } + + + + Commands.call("cofh tpx @p 623", player, world, true, true); Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); -return "Pass"; + return "Pass"; + } if(player.getDimension() == 623) { @@ -205,476 +610,93 @@ deathloop.register(); var lindenwyrmwarper = VanillaFactory.createItem("lyndenwyrm_warper"); lindenwyrmwarper.maxStackSize = 1; lindenwyrmwarper.glowing = true; -lindenwyrmwarper.itemRightClick = function(stack, world, player, hand) { - Commands.call("cofh tpx @p 162", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); -return "Pass"; -}; lindenwyrmwarper.register(); var gallifreywarper = VanillaFactory.createItem("gallifrey_warper"); gallifreywarper.maxStackSize = 1; gallifreywarper.glowing = true; -gallifreywarper.itemRightClick = function(stack, world, player, hand) { - Commands.call("cofh tpx @p 624", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); -return "Pass"; -}; gallifreywarper.register(); var lunawarper = VanillaFactory.createItem("luna_warper"); lunawarper.maxStackSize = 1; -lunawarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - if(player.getDimension() == 1) { - - Commands.call("cofh tpx @p 145", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "Pass"; - } - player.sendChat("需位于末地"); - return "FAIL"; -}; lunawarper.register(); var osiriswarper = VanillaFactory.createItem("osiris_warper"); osiriswarper.maxStackSize = 1; -osiriswarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 148", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; osiriswarper.register(); var ptahwarper = VanillaFactory.createItem("ptah_warper"); ptahwarper.maxStackSize = 1; -ptahwarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 149", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; ptahwarper.register(); var hatorwarper = VanillaFactory.createItem("hator_warper"); hatorwarper.maxStackSize = 1; -hatorwarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 150", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; hatorwarper.register(); var europawarper = VanillaFactory.createItem("europa_warper"); europawarper.maxStackSize = 1; -europawarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 151", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; europawarper.register(); var oiwarper = VanillaFactory.createItem("oi_warper"); oiwarper.maxStackSize = 1; -oiwarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 152", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; oiwarper.register(); var falacerwarper = VanillaFactory.createItem("falacer_warper"); falacerwarper.maxStackSize = 1; -falacerwarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 160", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; falacerwarper.register(); var orcuswarper = VanillaFactory.createItem("orcus_warper"); orcuswarper.maxStackSize = 1; -orcuswarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 161", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; orcuswarper.register(); var haumeawarper = VanillaFactory.createItem("haumea_warper"); haumeawarper.maxStackSize = 1; -haumeawarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 146", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; haumeawarper.register(); var sednawarper = VanillaFactory.createItem("sedna_warper"); sednawarper.maxStackSize = 1; -sednawarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 147", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; sednawarper.register(); var rheniawarper = VanillaFactory.createItem("rhenia_warper"); rheniawarper.maxStackSize = 1; -rheniawarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 163", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; rheniawarper.register(); var myrmexwarper = VanillaFactory.createItem("myrmex_warper"); myrmexwarper.maxStackSize = 1; -myrmexwarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 164", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; myrmexwarper.register(); var pixoniawarper = VanillaFactory.createItem("pixonia_warper"); pixoniawarper.maxStackSize = 1; -pixoniawarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 165", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; pixoniawarper.register(); var proximabeltwarper = VanillaFactory.createItem("proximabelt_warper"); proximabeltwarper.maxStackSize = 1; -proximabeltwarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 166", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; proximabeltwarper.register(); var nerowarper = VanillaFactory.createItem("nero_warper"); nerowarper.maxStackSize = 1; -nerowarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 170", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; nerowarper.register(); var zoiwarper = VanillaFactory.createItem("zoi_warper"); zoiwarper.maxStackSize = 1; -zoiwarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 171", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; zoiwarper.register(); var akathartoswarper = VanillaFactory.createItem("akathartos_warper"); akathartoswarper.maxStackSize = 1; -akathartoswarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 172", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; akathartoswarper.register(); var pauramwarper = VanillaFactory.createItem("pauram_warper"); pauramwarper.maxStackSize = 1; -pauramwarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 173", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; pauramwarper.register(); var alkemiawarper = VanillaFactory.createItem("alkemia_warper"); alkemiawarper.maxStackSize = 1; -alkemiawarper.itemRightClick = function(stack, world, player, hand) { - if(world.remote) { - return "FAIL"; - } - var pos = player.position.asPosition3f(); - var posChange = player.position.asPosition3f(); - posChange.y = pos.y - 1; - var blockPosBelowPlayer = posChange.asBlockPos(); - var blockBelow = world.getBlockState(blockPosBelowPlayer); - print(blockBelow.commandString); - var check_pos as crafttweaker.util.Position3f; - check_pos = crafttweaker.util.Position3f.create(pos.x, pos.y, pos.z); - if(world.getBiome(check_pos).name != "Space") { - player.sendChat("需位于空间站内"); - return "FAIL"; - } - Commands.call("cofh tpx @p 174", player, world, true, true); - Commands.call("summon astralsorcery:entitystarburst", player, world, true, true); - return "PASS"; -}; alkemiawarper.register(); @@ -901,4 +923,3 @@ warrencreationfabrial.itemRightClick = function(stack, world, player, hand) { }; warrencreationfabrial.register(); - diff --git a/scripts/ParallelEarthsRecipes.zs b/scripts/ParallelEarthsRecipes.zs index d257dabf..173295b4 100644 --- a/scripts/ParallelEarthsRecipes.zs +++ b/scripts/ParallelEarthsRecipes.zs @@ -574,4 +574,11 @@ recipes.addShaped(*2, recipes.addShaped(*2, [[, , ], [, , ], -[, , ]]); \ No newline at end of file +[, , ]]); + + + +recipes.addShaped(, +[[, , ], +[, , ], +[, , ]]); \ No newline at end of file diff --git a/scripts/PeriodicTable.zs b/scripts/PeriodicTable.zs index 42889650..bc42b56b 100644 --- a/scripts/PeriodicTable.zs +++ b/scripts/PeriodicTable.zs @@ -330,7 +330,7 @@ mods.nuclearcraft.electrolyser.addRecipe([*50, *10, *10, *100, *100, null, null, 200.0, 200.0, 14555.0, 0.1]); +mods.nuclearcraft.fusion.addRecipe([*10, *10, *100, *10, null, null, 200.0, 200.0, 14555.0, 0.1]); // making bohrium @@ -659,4 +659,3 @@ mods.nuclearcraft.melter.addRecipe([, * 144]); // making californium - diff --git a/scripts/RecipeConflicts.zs b/scripts/RecipeConflicts.zs index 53f616b4..69de53ef 100644 --- a/scripts/RecipeConflicts.zs +++ b/scripts/RecipeConflicts.zs @@ -2554,3 +2554,15 @@ recipes.addShapeless(, [, ]); recipes.addShapeless(, [, ]); + + + +recipes.addShapeless(, +[, +]); + + +mods.nuclearcraft.dissolver.addRecipe([, , ]); + + +mods.thermalexpansion.Centrifuge.addRecipe([() % 99, () % 99], , null, 2000); \ No newline at end of file diff --git a/scripts/ReliquaryGating.zs b/scripts/ReliquaryGating.zs new file mode 100644 index 00000000..af1e4d79 --- /dev/null +++ b/scripts/ReliquaryGating.zs @@ -0,0 +1,16 @@ +recipes.removeShaped(); + +recipes.addShaped(, +[[null, null, ], +[, , null], +[, , null]]); + + + + +recipes.removeShaped(); + +recipes.addShaped(, +[[, , ], +[, , ], +[, , ]]); diff --git a/scripts/RestControllers.zs b/scripts/RestControllers.zs index 4e197dcb..60b6425d 100644 --- a/scripts/RestControllers.zs +++ b/scripts/RestControllers.zs @@ -547,3 +547,12 @@ recipes.addShapeless(, recipes.addShapeless(, []); + +recipes.addShapeless(, +[]); + +recipes.addShapeless(, +[]); + +recipes.addShapeless(, +[]); \ No newline at end of file diff --git a/scripts/Tardis.zs b/scripts/Tardis.zs index 34794272..a3433f64 100644 --- a/scripts/Tardis.zs +++ b/scripts/Tardis.zs @@ -603,7 +603,7 @@ mods.extendedcrafting.TableCrafting.addShaped(, , , ], [, , , -, , , +, , , , , ], [, , , diff --git a/scripts/ToolTips.zs b/scripts/ToolTips.zs index 4bd956f7..49b712de 100644 --- a/scripts/ToolTips.zs +++ b/scripts/ToolTips.zs @@ -290,7 +290,7 @@ .addTooltip(format.red("与正确的粉末（4个）结合，原始森林维度将指引你")); -.addTooltip(format.red("将注魔药剂师之石与正确的粉末（4个）结合，原始森林维度将指引你")); +.addTooltip(format.red("将注魔药师之石与正确的粉末（4个）结合，原始森林维度将指引你")); .addTooltip(format.red("感谢ChaosStrikez，龙的bug没那么多了！")); @@ -346,7 +346,7 @@ .addTooltip(format.red("可施加超限附魔")); -.addTooltip(format.red("通过药剂师监狱钥匙获得")); +.addTooltip(format.red("通过药师监狱钥匙获得")); .addTooltip(format.red("将低语心中之心与正确的鳞片（4个）结合，秘境维度将指引你！")); @@ -361,9 +361,9 @@ // .addTooltip(format.red("Right click with Dyes to change color")); .addTooltip(format.red("发现于光精界")); -.addTooltip(format.red("用正确的药水精华（4个）环绕，药剂师蜂窝和暮色森林中的悚怖碎片将指引你")); +.addTooltip(format.red("用正确的药水精华（4个）环绕，药师蜂窝和暮色森林中的悚怖碎片将指引你")); -.addTooltip(format.red("用正确的药水精华（4个）环绕寒霜怖惧碎片，药剂师蜂窝和暮色森林中的悚怖碎片将指引你")); +.addTooltip(format.red("用正确的药水精华（4个）环绕寒霜怖惧碎片，药师蜂窝和暮色森林中的悚怖碎片将指引你")); .addTooltip(format.red("召唤石")); @@ -487,7 +487,7 @@ .addTooltip(format.red("与正确的龙之进化模组的生物灵魂（8个）结合，四处看看")); .addTooltip(format.red("某个超限附魔会很有用 ;)")); -.addTooltip(format.red("将相位福鲁伊克斯构装体与正确的龙之进化模组的生物灵魂（8个）结合，福鲁伊克斯史学家召唤石将指引你")); +.addTooltip(format.red("将相位福鲁伊克斯构造体与正确的龙之进化模组的生物灵魂（8个）结合，福鲁伊克斯史学家召唤石将指引你")); .addTooltip(format.red("感谢shardion为玩家接口实现了维度黑名单！梦魇世界不再有阶段锁了！")); @@ -1528,6 +1528,13 @@ .addTooltip(format.red("Broomey2 (单人)")); .addTooltip(format.red("The2ThatR1 (单人)")); .addTooltip(format.red("mewmaister (单人)")); +.addTooltip(format.red("BaneOfTrapezoids (单人)")); +.addTooltip(format.red("brobot6565 (单人)")); +.addTooltip(format.red("legoman187 (单人)")); +.addTooltip(format.red("Origami10004, _TheeOrangeJuice_, Blocktronix, SeeThinkWonder (团队)")); +.addTooltip(format.red("JustObsidian, canredback (团队)")); +.addTooltip(format.red("Sbmhawk (单人)")); +.addTooltip(format.red("amberacid (单人)")); .addTooltip(format.red("可被使用者使用")); .addTooltip(format.red("可被使用者使用")); @@ -1789,7 +1796,7 @@ .addTooltip(format.red("多方块升级，寒铁锻台：速度x20")); .addTooltip(format.red("多方块升级，定义器：输出x2")); .addTooltip(format.red("多方块升级，定义器：输出x8")); -.addTooltip(format.red("多方块升级，维度稳定器：速度x50")); +.addTooltip(format.red("多方块升级，维度稳定器：速度x50")); .addTooltip(format.red("多方块升级，龙炎坩埚：速度x6")); .addTooltip(format.red("多方块升级，龙炎锻炉：输出x8")); .addTooltip(format.red("多方块升级，附魔温室：速度x10")); @@ -2255,9 +2262,8 @@ .withTag({Material: "dragonsteel_lightning"}).addTooltip(format.red("AshThaMoth对匠魂盔甲的移除十分遗憾")); -.addTooltip(format.red("与选定物品合成，以防止其被放入转化桌")); -.addTooltip(format.red("注意：若稳定化了过多物品，会造成卡顿")); -.addTooltip(format.red("使用剪刀来去稳定化")); +.addTooltip(format.red("与具有EMC的物品合成，以防止其被放入转化桌")); +.addTooltip(format.red("使用退稳定剪刀来去稳定化")); .addTooltip(format.red("对于神话处理器，ME机械输出总线是输出产物最快的方式")); .addTooltip(format.red("对于神话处理器，ME机械输出总线是输出产物最快的方式")); @@ -2273,7 +2279,7 @@ .addTooltip(format.red("使用渐消羊毛右击一只特殊的羊")); .addTooltip(format.red("咒法主宰可能知道是哪只羊……")); -.addTooltip(format.red("使用容量卡以提高缓存容量，部分机器可能会用得到")); +.addTooltip(format.red("感谢Alecsio帮忙修复了相关问题")); .addTooltip(format.red("站在塞德娜金属稳定器上")); @@ -2375,11 +2381,25 @@ .addTooltip(format.red("跃迁器")); .addTooltip(format.red("站在JEI中显示的结构中心来激活")); -.addTooltip(format.red("警告：若世界是在beta-0.18版本之前创建的，你需要手动生成维度")); +.addTooltip(format.red("警告：若世界是在pre-0.18版本之前创建的，你需要手动生成维度")); .addTooltip(format.red("关闭整合包，备份存档")); .addTooltip(format.red("从config > advRocketry文件夹中复制'plantDefs.xml'文件到saves > worldname > advRocketry")); .addTooltip(format.red("打开整合包，重新使用该物品")); +.addTooltip(format.red("跃迁器")); +.addTooltip(format.red("站在JEI中显示的结构中心来激活")); +.addTooltip(format.red("警告：若世界是在pre-0.18版本之前创建的，你需要手动生成维度")); +.addTooltip(format.red("关闭整合包，备份存档")); +.addTooltip(format.red("从config > advRocketry文件夹中复制'plantDefs.xml'文件到saves > worldname > advRocketry")); +.addTooltip(format.red("打开整合包，重新使用该物品")); + +.addTooltip(format.red("跃迁器")); +.addTooltip(format.red("站在JEI中显示的结构中心来激活")); +.addTooltip(format.red("警告：若世界是在pre-0.18版本之前创建的，你需要手动生成维度")); +.addTooltip(format.red("关闭整合包，备份存档")); +.addTooltip(format.red("从config > advRocketry文件夹中复制'plantDefs.xml'文件到saves > worldname > advRocketry")); +.addTooltip(format.red("打开整合包，重新使用该物品")); + .addTooltip(format.red("同样适用于其他多种燃料！")); .addTooltip(format.red("站在叁壹界中发现的陶瓦上使用")); @@ -2487,6 +2507,167 @@ .addTooltip(format.red("预览中只显示了4个方块，但实际上有19个")); +.addTooltip(format.red("注意：该多方块可使用多种不同的泥土、花朵以及浮空花，但预览中只显示了一些默认选项")); +.addTooltip(format.red("手动放置你喜欢的浮空花")); + + +.addTooltip(format.red("注意：会造成卡顿，后续可能会从整合包中移除")); +.addTooltip(format.red("可使用物品栏界面的“Muffler”按钮来关闭特定声音")); + +.addTooltip(format.red("注意：会造成卡顿，后续可能会从整合包中移除")); +.addTooltip(format.red("可使用物品栏界面的“Muffler”按钮来关闭特定声音")); + +.addTooltip(format.red("感谢Alecsio在ME流体处理方面的帮助！")); + +.addTooltip(format.red("只有咒法主宰才能获得！")); +.addTooltip(format.red("感谢osto让经验浴池成为可能！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider为这些多方块升级绘制的纹理！")); +.addTooltip(format.red("感谢NerdySpider为这些多方块升级绘制的纹理！")); +.addTooltip(format.red("感谢NerdySpider为这些多方块升级绘制的纹理！")); +.addTooltip(format.red("感谢NerdySpider为这些多方块升级绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider为所有超越天显化器绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider为该系列物品绘制的纹理！")); +.addTooltip(format.red("感谢NerdySpider为该系列物品绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider为该系列物品绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("警告：不要点击配方中心的镭射枪")); +.addTooltip(format.red("会造成崩溃")); +.addTooltip(format.red("在修了在修了")); + +.addTooltip(format.red("感谢NerdySpider为显化系列物品绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider为该裂变合成线绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的洞悉星辉纹理！")); +.addTooltip(format.red("感谢NerdySpider绘制的洞悉星辉纹理！")); + +.addTooltip(format.red("感谢NerdySpider为黑洞合金合成线绘制的纹理！")); +.addTooltip(format.red("感谢NerdySpider为黑洞合金合成线绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider为枪之恶魔绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider为三一绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider为具现绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + + +.addTooltip(format.red("感谢NerdySpider绘制的灵体召唤物纹理！")); + +.addTooltip(format.red("感谢NerdySpider为争竞界绘制的纹理！")); +.addTooltip(format.red("感谢NerdySpider为争竞界绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider为衰腐界绘制的纹理！")); +.addTooltip(format.red("感谢NerdySpider为衰腐界绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider为叁壹界绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider为部分粉重绘的纹理！")); +.addTooltip(format.red("感谢NerdySpider为部分粉重绘的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); + +.addTooltip(format.red("感谢NerdySpider为核心重绘的纹理！")); + +.addTooltip(format.red("感谢NerdySpider为水晶重绘的纹理！")); +.addTooltip(format.red("感谢NerdySpider为水晶重绘的纹理！")); + +.addTooltip(format.red("感谢ZY在该物品脚本上的帮助！")); +.addTooltip(format.red("感谢ZY在该物品脚本上的帮助！")); +.addTooltip(format.red("感谢ZY在该物品脚本上的帮助！")); +.addTooltip(format.red("感谢ZY在该物品脚本上的帮助！")); + + + +.addTooltip(format.red("放置在蜜蜂星门多方块结构内")); + +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); +.addTooltip(format.red("放置在蜜蜂星门多方块结构内，需位于空间站")); + +.addTooltip(format.red("放置在虫洞场发生器多方块结构内")); +.addTooltip(format.red("放置在虫洞场发生器多方块结构内")); +.addTooltip(format.red("放置在虫洞场发生器多方块结构内")); +.addTooltip(format.red("放置在虫洞场发生器多方块结构内")); +.addTooltip(format.red("放置在虫洞场发生器多方块结构内")); +.addTooltip(format.red("放置在虫洞场发生器多方块结构内")); + + +.addTooltip(format.red("站在多方块结构预览显示的结构中心")); +.addTooltip(format.red("使用该物品右击以进入维度")); + +.addTooltip(format.red("站在多方块结构预览显示的结构中心")); +.addTooltip(format.red("使用该物品右击以进入维度")); + +.addTooltip(format.red("通过清除腐化获得")); + +.addTooltip(format.red("感谢osto使多方块传送结构成为可能！")); +.addTooltip(format.red("感谢osto使多方块传送结构成为可能！")); +.addTooltip(format.red("感谢osto使多方块传送结构成为可能！")); + + +.addTooltip(format.red("血肉世界灵液发现于失落的城市维度")); + +.addTooltip(format.red("初始可通过神圣树苗获得，蜜蜂通过生机之树召唤石获得")); +.addTooltip(format.red("初始可通过神圣树苗获得，蜜蜂通过生机之树召唤石获得")); + diff --git a/scripts/ToolTips2.zs b/scripts/ToolTips2.zs index 8a76ce6d..0068ce69 100644 --- a/scripts/ToolTips2.zs +++ b/scripts/ToolTips2.zs @@ -110,15 +110,10 @@ import crafttweaker.item.IItemCondition; .addTooltip(format.red("发现于下界的元素室")); -.addTooltip(format.red("打开一个临时虫洞，注意，无法使用该物品返回！")); -.addTooltip(format.red("打开一个临时虫洞，注意，无法使用该物品返回！")); -.addTooltip(format.red("打开一个临时虫洞，注意，无法使用该物品返回！")); -.addTooltip(format.red("打开一个临时虫洞，注意，无法使用该物品返回！")); -.addTooltip(format.red("打开一个临时虫洞，注意，无法使用该物品返回！")); .addTooltip(format.red("发现于光精界的沼泽高塔")); @@ -1418,13 +1413,13 @@ import crafttweaker.item.IItemCondition; .addTooltip(format.red("发现于漆黑世界")); -.addTooltip(format.red("由于bug，无法使用AE2自动合成，需要的话请使用被动合成")); +.addTooltip(format.red("由于bug，无法使用AE2自动合成，请转用“更好的”版本")); -.addTooltip(format.red("由于bug，无法使用AE2自动合成，需要的话请使用被动合成")); +.addTooltip(format.red("由于bug，无法使用AE2自动合成，请转用“更好的”版本")); -.addTooltip(format.red("由于bug，无法使用AE2自动合成，需要的话请使用被动合成")); +.addTooltip(format.red("由于bug，无法使用AE2自动合成，请转用“更好的”版本")); -.addTooltip(format.red("由于bug，无法使用AE2自动合成，需要的话请使用被动合成")); +.addTooltip(format.red("由于bug，无法使用AE2自动合成，请转用“更好的”版本")); .addTooltip(format.red("第一个召唤石！右击召唤一座地牢！")); @@ -2066,6 +2061,7 @@ import crafttweaker.item.IItemCondition; .addTooltip(format.red("按Z键切换模式，Shift+Z切换流体模式")); .addTooltip(format.red("使用/wandOops命令来撤销上一步操作")); +.addTooltip(format.red("警告：不要使用该物品放置带有物品栏的方块，以及其他方块实体")); .addTooltip(format.red("通过轨道召唤石获得")); .addTooltip(format.red("感谢Reclipse绘制的纹理！")); @@ -2987,7 +2983,7 @@ import crafttweaker.item.IItemCondition; .addTooltip(format.red("警告：不要与辐射洗涤器连接，可能会坏档")); .addTooltip(format.red("警告：不要与辐射洗涤器连接，可能会坏档")); -.addTooltip(format.red("最多增加20最大生命值，可在地牢箱子中找到（青铜地牢中更常见）")); +.addTooltip(format.red("最多增加20最大生命值，可在地牢箱子中找到（黄金地牢中更常见）")); .addTooltip(format.red("感谢NerdySpider绘制的纹理！")); diff --git a/scripts/Trinitas.zs b/scripts/Trinitas.zs index c7dd7dcf..2379d059 100644 --- a/scripts/Trinitas.zs +++ b/scripts/Trinitas.zs @@ -189,6 +189,7 @@ inffurncuendillar3.build(); mods.extendedcrafting.CompressionCrafting.addRecipe(, , 100, , 100000); val compresssingularfractal = RecipeBuilder.newBuilder("compresssingularfractal","quantum_condenser",10); +compresssingularfractal.addEnergyPerTickInput(500000); compresssingularfractal.addItemInput(*100); compresssingularfractal.addItemOutput(); compresssingularfractal.build(); diff --git a/scripts/VetheaEasier.zs b/scripts/VetheaEasier.zs index daa4c393..26079377 100644 --- a/scripts/VetheaEasier.zs +++ b/scripts/VetheaEasier.zs @@ -780,11 +780,16 @@ recipes.addShapeless(, , ]); +mods.thermalexpansion.Infuser.addRecipe(, , 100000); + +mods.extendedcrafting.CompressionCrafting.addRecipe(, +, 1024, , 100000); + recipes.addShaped(, -[[null, .withTag({"enderio:energy": 500000000}), null], -[.withTag({"enderio:energy": 500000000}), .reuse(), .withTag({"enderio:energy": 500000000})], -[null, .withTag({"enderio:energy": 500000000}), null]]); +[[, , ], +[, .reuse(), ], +[, , ]]); recipes.removeShaped(, [[, , ], @@ -843,4 +848,4 @@ recipes.addShaped(, [null, , null]]); recipes.addShapeless(, -[]); +[]); \ No newline at end of file diff --git a/scripts/mixin/FixMachineryFluidOutputBuses.zs b/scripts/mixin/FixMachineryFluidOutputBuses.zs new file mode 100644 index 00000000..383c5c4f --- /dev/null +++ b/scripts/mixin/FixMachineryFluidOutputBuses.zs @@ -0,0 +1,20 @@ +#loader mixin + +/* + Bandaid fix to prevent voiding of fluids when using fluid machinery output buses +*/ +#mixin Mixin +#{targets: "github.kasuminova.mmce.common.tile.MEFluidOutputBus"} +zenClass MixinFluidMachinery { + #mixin ModifyArg + #{ + # method: "Lgithub/kasuminova/mmce/common/tile/MEFluidOutputBus;()V", + # at: { + # value: "INVOKE", + # target: "Lgithub/kasuminova/mmce/common/util/AEFluidInventoryUpgradeable;setOneFluidOneSlot(Z)V" + # } + #} + function mbc_fixFluidMachinery(toYeet as bool) as bool { + return false; + } +} \ No newline at end of file