diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 1015ef2..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,13 +0,0 @@ -# These are supported funding model platforms - -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] -patreon: stardustlabs -open_collective: # Replace with a single Open Collective username -ko_fi: stardustlabs -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -liberapay: # Replace with a single Liberapay username -issuehunt: # Replace with a single IssueHunt username -otechie: # Replace with a single Otechie username -lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry -custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cd9e3d7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +__MACOSX \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index e7b8437..0000000 --- a/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# Incendium - -[![Latest Version](https://img.shields.io/github/v/release/Stardust-Labs-MC/Incendium?color=blueviolet&logo=github "View latest release")](https://github.com/Stardust-Labs-MC/Incendium/releases) [![Discord Badge](https://img.shields.io/discord/738046951236567162?color=blue&logo=discord "Join our Discord Server")](https://discord.gg/stardustlabs) [![Modrinth Badge](https://img.shields.io/modrinth/dt/incendium?label=Modrinth&logo=modrinth "View our Modrinth page")](https://modrinth.com/mod/incendium) [![License Badge](https://img.shields.io/badge/license-Stardust_Labs-green "View the Stardust Labs License")](https://github.com/Stardust-Labs-MC/license) [![Wiki Badge](https://img.shields.io/badge/wiki-Miraheze-yellow "View our Wiki")](https://discord.gg/stardustlabs) [![Issues Badge](https://img.shields.io/github/issues/Stardust-Labs-MC/Incendium?color=orange&logo=github "View or open an issue")](https://github.com/Stardust-Labs-MC/Incendium/issues) [![Weblate Badge](https://img.shields.io/weblate/progress/stardust-labs?server=https%3A%2F%2Fweblate.catter.dev&logo=weblate "Translate here")](https://weblate.catter.dev/projects/stardust-labs) - -Incendium is a datapack that completely revamps the nether, way more than what Minecraft did in the 1.16 Nether Update. - -![Incendium Banner](https://user-images.githubusercontent.com/63272345/224804955-2c8a39b1-d015-462b-a28c-dde27f747c90.png) - -## Notes -- Incendium has an [Optional Resource Pack](https://modrinth.com/resourcepack/incendium-optional-resourcepack)! This is __not__ required, but it allows all items to have their own beautiful textures. -- Incendium is **not** compatible with Amplified Nether -- Do not add this to an existing nether - reset yours first, or use a new world -- View the structures and biomes per seed using [jacobsjo](https://github.com/jacobsjo)'s [Minecraft Datapack Map](https://map.jacobsjo.eu/) - -## Description -### Biomes -Incendium adds 8 unique biomes to the nether. Do you bravely venture through the perilous **Quartz Flats**, wander the mysterious **Withered Forest**, or battle your way through the steep **Infernal Dunes**? Each biome has a unique personality and story to tell. With unique block themes in each biomes, opportunities for new farms for technical players, 3D biomes, and stunning terrain, there is truly something for everyone. - -### Structures -To compliment the lovely biomes, there are 9+ structures for you to explore and conquer. In the Ash Barrens, the **Foribdden Castle** stands forbodingly, with courageous Piglins defending its treasured loot - one of the largest and complex random structures in Minecraft! Alternatively, you can conquer the ominous **Sanctum** with its illagers defending dark secrets and strong weapons. The skeleton chef Torte defends his **Quartz Kitchen**, and the Withered Director his **Nether Reactor**. What will you conquer first? - -### Items -Every mob you defeat and structure you conquer has its reward - Incendium pays you handsomely with both rick loot and custom weapons! Defeating the Hovering Inferno could earn you the **Trailblazer** - a flame-spewing bow. A high damage, but taxing **Greatsword of Sacrifice** hides within the Forbidden Castle's walls, along with the helpful **Hefty Pickaxe**. Or maybe you prefer to find the **Hazmat Suit** to protect you from all types of poisonous attacks. There are over 25 items to forge your own playstyle with! - -### Mobs -No datapack would be complete without its own mobs to fight you. The Toxic Heap is home of the agile **Toxic Slimes**, and the Withered Forest is haunted by the **Restless Spirits**. On the other hand, you could go on a rescue missue to save the **Ghastling** from the Abandoned Tower - in return, it will defend you from Ghasts. If none of this is challenging, you can summon the all-powerful **Hovering Inferno** boss for a difficult and dirty battle. -__ __ - -[![Patron Ad](https://user-images.githubusercontent.com/63272345/224786738-7baefaf8-267f-41b6-8ac5-53cc4bd5707e.png "Join our Patreon!")](https://www.patreon.com/stardustlabs) - -[![Bisect Hosting Ad](https://user-images.githubusercontent.com/63272345/224786219-f87f21d2-fb51-4d78-82df-a16e83fe25c9.png "Use code STARDUST")](https://www.bisecthosting.com/stardust) diff --git a/assets/minecraft/gpu_warnlist.json b/assets/minecraft/gpu_warnlist.json deleted file mode 100755 index fd333c5..0000000 --- a/assets/minecraft/gpu_warnlist.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "renderer" : [], - "version" : [ - "^([0-2]\\.[0-9])" - ], - "vendor" : [] -} diff --git a/assets/minecraft/lang/de_de.json b/assets/minecraft/lang/de_de.json deleted file mode 100755 index d8de4a6..0000000 --- a/assets/minecraft/lang/de_de.json +++ /dev/null @@ -1,130 +0,0 @@ -{ - "language.name": "Deutsch", - "language.region": "Deutschland", - "language.code": "de_de", - - "Forged in Flames": "In Flammen geschmiedet", - "Hellfire Mantle": "Höllenfeuer Mantel", - "Border of Life": "Grenze des Lebens", - "Ghostbuster": "Ghostbuster", - "The Conqueror": "Der Eroberer", - "Fallen to Ashes": "In Asche gefallen", - "Duel of the Fates": "Duell der Schicksale", - "Light-Sensitive": "Lichtempfindlich", - "In the Hall of the Piglin King": "In den Hallen des Piglin Königs", - "Treacherous Heights": "Heimtückische Höhen", - "Strange Biomes": "Komische Biome", - "Feed the Beast": "Feed the Beast", - "GLORY TO INCENDZKA!": "RUHM ZU INCENDZKA!", - "Darude - Firestorm": "Darude - Firestorm", - "Ceci n'est pas un blaze": "Ceci n'est pas un blaze", - "Apparitions": "Erscheinung", - "Kitchen's Treasure": "Der Küchen Schatz", - "Piglin Pillage": "Piglin Plünderung", - "Lunatic Mode": "Lunatic Modus", - "Mystic Wisdom": "Mystische Weisheit", - "Nuclear Fusion": "Kernspaltung", - "Phantom Menace": "Phantom Bedrohung", - "Plumber's Plunder": "Klempners Plunder", - "Pipe Dream": "Röhren Traum", - "Hellish Paradise": "Höllisches Paradies", - "The Floor is Tears": "Der Boden ist Tränen", - "Ghast Buster":"Ghast Buster", - "Run.": "Run.", - "Toxic Personality": "Toxische Persönlichkeit", - "Soul Searcher": "Seelensucher", - "\"Special\" Delivery": "\"Special\" Lieferung", - "Risen from Fire": "Aus dem Feuer auferstanden", - "You Fool!": "Du Narr!", - "UNLIMITED POWER!!!": "UNENDLICHE POWER!!!", - "Ancient Battlefield": "Uraltes Schlachtfeld", - - "Incendium":"Incendium", - "Explore the terrifying, and rewarding, Incendium Nether":"Erkunde den fürchterlichen, und Belohnenden", - - - "Firestorm":"Feuersturm", - "Charm of Extinguishing":"Zauber des Löschens", - "Torch of Lunacy":"Fackel der erleuchtung", - "Necrotic Shield":"Nektrotisches Schild", - "Reacts to attacks with":"Reagiert auf Angriffe mit", - "an explosion of death":"Einer Explosion des Todes", - "Prismatic Shield":"Prismatisches Schild", - "Reflects attacks with a":"reflektiert Angriffe mit", - "powerful spark of light":"ein starker Funken Licht", - "Infernal Wing":"Infernaler Flügel", - "Ghastling":"Ghastling", - "Destroys ghast fireballs that it can see.":"Zerstört Ghast Feuerbälle, die es sehen kann.", - "Loves to eat fire charges.":"Liebt es Feuerbälle zu essen.", - "Loyal but lazy":"Loyal aber faul.", - - "Chilling Blade":"Eisige Klinge", - "Freezes souls to the core":"Friert Seelen bis zum Kern", - "Blazing Hatchet":"Flammendes Beil", - "Multiplex Crossbow":"Multiplex Armbrust", - "Hefty Pickaxe":"Kräftige Spitzhacke", - "Greatsword of Sacrifice":"Großschwert der Opfer", - "Drains the life of its wielder":"Entzieht dem träger sein Leben", - "to inflict massive damage":"um massiven Schaden zuzufügen", - "Sentry's Wrath":"Sentry's Zorn", - "Turns spectral arrows into":"Verwandelt Spektral Pfeile in", - "a slow, powerful attack.":"Einen langamen aber starken Angriff.", - "Beware the cooldown.":"Sei dir dem cooldown bewusst", - "Voltaic Trident":"Voltaic Dreizack", - "Unstable Powder":"Instabilles Puder", - "Emits a brilliant light when dropped":"Strahlt ein starkes Licht aus wenn gedroppt", - "Scarlet Dagger":"Scharlachrot Dagger", - "Drains the life of its slain victims":"Entzieht seinen Opfern das Leben", - "Withersbane":"Withersban", - "Radiation Shield":"Strahlungs Schild", - "Releases radiation":"Setzt Strahlung frei", - "when blocking an attack":"wenn ein angiff blockiert wird", - - - - - - - - - - - - "Use the Infernal Wing to upgrade your elytra in a Smithing Table": "Use the Infernal Wing to upgrade your elytra in a Smithing Table", - "Enter the chaotic Extreme Basalt Deltas":"Enter the chaotic Extreme Basalt Deltas", - "Kill a Desert Blaze on the boundary of light and dark to get both of its drops":"Kill a Desert Blaze on the boundary of light and dark to get both of its drops", - "Put on some chain armor and use it to dispel a restless spirit":"Put on some chain armor and use it to dispel a restless spirit", - "Storm a Forbidden Castle and kill every last piglin living inside":"Storm a Forbidden Castle and kill every last piglin living inside", - "Survive the Inferno's last spell and claim your reward.":"Survive the Inferno's last spell and claim your reward.", - "Give a Sentry a taste of its own medicine":"Give a Sentry a taste of its own medicine", - "Kill one of the odd Desert Blazes native to the Infernal Dunes":"Kill one of the odd Desert Blazes native to the Infernal Dunes", - "Enter a Forbidden Castle at your own peril":"Enter a Forbidden Castle at your own peril", - "Mine the exposed ancient debris in the height of the Extreme Basalt Deltas":"Mine the exposed ancient debris in the height of the Extreme Basalt Deltas", - "Enter a mutated Nether biome":"Enter a mutated Nether biome", - "Feed a Ghastling its odd favorite food - fire charges - to make it follow you":"Feed a Ghastling its odd favorite food - fire charges - to make it follow you", - "Stand at the intersection of four biomes in the Nether":"Stand at the intersection of four biomes in the Nether", - "Experience the blazing heat of the Infernal Dunes":"Experience the blazing heat of the Infernal Dunes", - "Kill a Pipeline Sentry":"Kill a Pipeline Sentry", - "Kill a restless spirit":"Kill a restless spirit", - "Brave the Quartz Flats' frozen lava seas":"Brave the Quartz Flats' frozen lava seas", - "Find the hidden treasure in the Quartz Kitchen":"Find the hidden treasure in the Quartz Kitchen", - "Steal some loot from a Piglin Village":"Steal some loot from a Piglin Village", - "Survive the Inferno's \"Nether Sign「Last Stand」\" with no armor":"Survive the Inferno's \"Nether Sign「Last Stand」\" with no armor", - "Discover every type of loot in a Power Plant":"Discover every type of loot in a Power Plant", - "Loot a Power Plant":"Loot a Power Plant", - "Loot the treasures of a Phantom Nest":"Loot the treasures of a Phantom Nest", - "Retrieve a Pipeline's hidden treasure":"Retrieve a Pipeline's hidden treasure", - "Enter a pipeline, but beware the dangerous sentry blazes":"Enter a pipeline, but beware the dangerous sentry blazes", - "Enter the Purified Dunes, homeland of the Hovering Inferno":"Enter the Purified Dunes, homeland of the Hovering Inferno", - "Beware the beautiful and deadly Quartz Flats":"Beware the beautiful and deadly Quartz Flats", - "Kill a ghast on its home turf above the frozen lava seas":"Kill a ghast on its home turf above the frozen lava seas", - "You can't kill the Inferno. Just survive to win.":"You can't kill the Inferno. Just survive to win.", - "Get poisoned by a toxic slime":"Get poisoned by a toxic slime", - "Discover every single Nether biome":"Discover every single Nether biome", - "Afflict a ghast with Speed, Regeneration and Invisibility -- then kill it to obtain its Ghastling":"Afflict a ghast with Speed, Regeneration and Invisibility -- then kill it to obtain its Ghastling", - "Sacrifice a nether star at an altar to summon the Hovering Inferno":"Sacrifice a nether star at an altar to summon the Hovering Inferno", - "Kill the skeleton chef Torte and loot his kitchen":"Kill the skeleton chef Torte and loot his kitchen", - "Enter the nuclear wastelands of the Toxic Heap":"Enter the nuclear wastelands of the Toxic Heap", - "Get hit by a Sentry's lightning attack":"Get hit by a Sentry's lightning attack", - "Enter the Withered Forest, ancestral battleground of the Piglins and Wither Skeletons":"Enter the Withered Forest, ancestral battleground of the Piglins and Wither Skeletons" -} diff --git a/assets/minecraft/lang/en_us.json b/assets/minecraft/lang/en_us.json deleted file mode 100755 index 4bf166a..0000000 --- a/assets/minecraft/lang/en_us.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "language.name": "English", - "language.region": "United States", - "language.code": "en_us", - - "Forged in Flames": "Forged in Flames", - "Hellfire Mantle": "Hellfire Mantle", - "Border of Life": "Border of Life", - "Ghostbuster": "Ghostbuster", - "The Conqueror": "The Conqueror", - "Fallen to Ashes": "Fallen to Ashes", - "Duel of the Fates": "Duel of the Fates", - "Light-Sensitive": "Light-Sensitive", - "In the Hall of the Piglin King": "In the Hall of the Piglin King", - "Treacherous Heights": "Treacherous Heights", - "Strange Biomes": "Strange Biomes", - "Feed the Beast": "Feed the Beast", - "GLORY TO INCENDZKA!": "GLORY TO INCENDZKA!", - "Darude - Firestorm": "Darude - Firestorm", - "Ceci n'est pas un blaze": "Ceci n'est pas un blaze", - "Apparitions": "Apparitions", - "Kitchen's Treasure": "Kitchen's Treasure", - "Piglin Pillage": "Piglin Pillage", - "Lunatic Mode": "Lunatic Mode", - "Mystic Wisdom": "Mystic Wisdom", - "Nuclear Fusion": "Nuclear Fusion", - "Phantom Menace": "Phantom Menace", - "Plumber's Plunder": "Plumber's Plunder", - "Pipe Dream": "Pipe Dream", - "Hellish Paradise": "Hellish Paradise", - "The Floor is Tears": "The Floor is Tears", - "Ghast Buster":"Ghast Buster", - "Run.": "Run.", - "Toxic Personality": "Toxic Personality", - "Soul Searcher": "Soul Searcher", - "\"Special\" Delivery": "\"Special\" Delivery", - "Risen from Fire": "Risen from Fire", - "You Fool!": "You Fool!", - "UNLIMITED POWER!!!": "UNLIMITED POWER!!!", - "Ancient Battlefield": "Ancient Battlefield", - "Sacred Sands":"Sacred Sands", - - "Incendium":"Incendium", - "Explore the terrifying, and rewarding, Incendium Nether":"Explore the terrifying, and rewarding, Incendium Nether", - - - "Firestorm":"Firestorm", - "Charm of Extinguishing":"Charm of Extinguishing", - "Torch of Lunacy":"Torch of Lunacy", - "Necrotic Shield":"Necrotic Shield", - "Reacts to attacks with":"Reacts to attacks with", - "an explosion of death":"an explosion of death", - "Prismatic Shield":"Prismatic Shield", - "Reflects attacks with a":"Reflects attacks with a", - "powerful spark of light":"powerful spark of light", - "Infernal Wing":"Infernal Wing", - "Ghastling":"Ghastling", - "Destroys ghast fireballs that it can see.":"Destroys ghast fireballs that it can see.", - "Loves to eat fire charges.":"Loves to eat fire charges.", - "Loyal but lazy":"Loyal but lazy", - - "Chilling Blade":"Chilling Blade", - "Freezes souls to the core":"Freezes souls to the core", - "Blazing Hatchet":"Blazing Hatchet", - "Multiplex Crossbow":"Multiplex Crossbow", - "Hefty Pickaxe":"Hefty Pickaxe", - "Greatsword of Sacrifice":"Greatsword of Sacrifice", - "Drains the life of its wielder":"Drains the life of its wielder", - "to inflict massive damage":"to inflict massive damage", - "Sentry's Wrath":"Sentry's Wrath", - "Turns spectral arrows into":"Turns spectral arrows into", - "a slow, powerful attack.":"a slow, powerful attack.", - "Beware the cooldown.":"Beware the cooldown.", - "Voltaic Trident":"Voltaic Trident", - "Unstable Powder":"Unstable Powder", - "Emits a brilliant light when dropped":"Emits a brilliant light when dropped", - "Scarlet Dagger":"Scarlet Dagger", - "Drains the life of its slain victims":"Drains the life of its slain victims", - "Withersbane":"Withersbane", - "Radiation Shield":"Radiation Shield", - "Releases radiation":"Releases radiation", - "when blocking an attack":"when blocking an attack", - - - - - - - - - - - - "Use the Infernal Wing to upgrade your elytra in a Smithing Table": "Use the Infernal Wing to upgrade your elytra in a Smithing Table", - "Enter the chaotic Extreme Basalt Deltas":"Enter the chaotic Extreme Basalt Deltas", - "Kill a Desert Blaze on the boundary of light and dark to get both of its drops":"Kill a Desert Blaze on the boundary of light and dark to get both of its drops", - "Put on some chain armor and use it to dispel a restless spirit":"Put on some chain armor and use it to dispel a restless spirit", - "Storm a Forbidden Castle and kill every last piglin living inside":"Storm a Forbidden Castle and kill every last piglin living inside", - "Survive the Inferno's last spell and claim your reward.":"Survive the Inferno's last spell and claim your reward.", - "Give a Sentry a taste of its own medicine":"Give a Sentry a taste of its own medicine", - "Kill one of the odd Desert Blazes native to the Infernal Dunes":"Kill one of the odd Desert Blazes native to the Infernal Dunes", - "Enter a Forbidden Castle at your own peril":"Enter a Forbidden Castle at your own peril", - "Mine the exposed ancient debris in the height of the Extreme Basalt Deltas":"Mine the exposed ancient debris in the height of the Extreme Basalt Deltas", - "Enter a mutated Nether biome":"Enter a mutated Nether biome", - "Feed a Ghastling its odd favorite food - fire charges - to make it follow you":"Feed a Ghastling its odd favorite food - fire charges - to make it follow you", - "Stand at the intersection of four biomes in the Nether":"Stand at the intersection of four biomes in the Nether", - "Experience the blazing heat of the Infernal Dunes":"Experience the blazing heat of the Infernal Dunes", - "Kill a Pipeline Sentry":"Kill a Pipeline Sentry", - "Kill a restless spirit":"Kill a restless spirit", - "Brave the Quartz Flats' frozen lava seas":"Brave the Quartz Flats' frozen lava seas", - "Find the hidden treasure in the Quartz Kitchen":"Find the hidden treasure in the Quartz Kitchen", - "Steal some loot from a Piglin Village":"Steal some loot from a Piglin Village", - "Survive the Inferno's \"Nether Sign「Last Stand」\" with no armor":"Survive the Inferno's \"Nether Sign「Last Stand」\" with no armor", - "Discover every type of loot in a Power Plant":"Discover every type of loot in a Power Plant", - "Loot a Power Plant":"Loot a Power Plant", - "Loot the treasures of a Phantom Nest":"Loot the treasures of a Phantom Nest", - "Retrieve a Pipeline's hidden treasure":"Retrieve a Pipeline's hidden treasure", - "Enter a pipeline, but beware the dangerous sentry blazes":"Enter a pipeline, but beware the dangerous sentry blazes", - "Enter the Purified Dunes, homeland of the Hovering Inferno":"Enter the Purified Dunes, homeland of the Hovering Inferno", - "Beware the beautiful and deadly Quartz Flats":"Beware the beautiful and deadly Quartz Flats", - "Kill a ghast on its home turf above the frozen lava seas":"Kill a ghast on its home turf above the frozen lava seas", - "You can't kill the Inferno. Just survive to win.":"You can't kill the Inferno. Just survive to win.", - "Get poisoned by a toxic slime":"Get poisoned by a toxic slime", - "Discover every single Nether biome":"Discover every single Nether biome", - "Afflict a ghast with Speed, Regeneration and Invisibility -- then kill it to obtain its Ghastling":"Afflict a ghast with Speed, Regeneration and Invisibility -- then kill it to obtain its Ghastling", - "Sacrifice a nether star at an altar to summon the Hovering Inferno":"Sacrifice a nether star at an altar to summon the Hovering Inferno", - "Kill the skeleton chef Torte and loot his kitchen":"Kill the skeleton chef Torte and loot his kitchen", - "Enter the nuclear wastelands of the Toxic Heap":"Enter the nuclear wastelands of the Toxic Heap", - "Get hit by a Sentry's lightning attack":"Get hit by a Sentry's lightning attack", - "Enter the Withered Forest, ancestral battleground of the Piglins and Wither Skeletons":"Enter the Withered Forest, ancestral battleground of the Piglins and Wither Skeletons" -} \ No newline at end of file diff --git a/assets/minecraft/lang/fr_fr.json b/assets/minecraft/lang/fr_fr.json deleted file mode 100755 index e4a851f..0000000 --- a/assets/minecraft/lang/fr_fr.json +++ /dev/null @@ -1,145 +0,0 @@ -{ - "language.name": "French", - "language.region": "France", - "language.code": "fr_fr", - - "Forged in Flames": "Forgé dans les flammes", - "Hellfire Mantle": "Manteau infernal", - "Border of Life": "Bordure de la vie", - "Ghostbuster": "Chasseur de ghasts", - "The Conqueror": "Le Conquérant", - "Fallen to Ashes": "Réduit en cendres", - "Duel of the Fates": "Duel du destin", - "Light-Sensitive": "Photosensible", - "In the Hall of the Piglin King": "Dans le hall du roi piglin", - "Treacherous Heights": "Hauteurs extrêmes", - "Strange Biomes": "Biomes étranges", - "Feed the Beast": "Nourrir la bête", - "GLORY TO INCENDZKA!": "GLOIRE A INCENDZKA !", - "Darude - Firestorm": "Darude - Firestorm", - "Ceci n'est pas un blaze": "Ceci n'est pas un blaze", - "Apparitions": "Apparitions", - "Kitchen's Treasure": "Le trésor de la cuisine", - "Piglin Pillage": "Pillage de piglin", - "Lunatic Mode": "Mode lunatique", - "Mystic Wisdom": "Sagesse mythique", - "Nuclear Fusion": "Fusion Nucléaire", - "Phantom Menace": "Menace fantôme", - "Plumber's Plunder": "Pillage de plombier", - "Pipe Dream": "Rêve de Tuyaux", - "Hellish Paradise": "Paradis infernal", - "The Floor is Tears": "Le sol de larmes", - "Ghast Buster":"Chasseur de fantômes", - "Run.": "Cours.", - "Toxic Personality": "Personalité toxique", - "Soul Searcher": "Chercheur d'âmes", - "\"Special\" Delivery": "Collis \"Spécial\"", - "Risen from Fire": "Ressuscité du feu", - "You Fool!": "Idiot !", - "UNLIMITED POWER!!!": "PUISSANCE ILLIMITE !!!", - "Ancient Battlefield": "Ancient champs de bataille", - - - "Incendium":"Incendium", - "Explore the terrifying, and rewarding, Incendium Nether":"Explore le terrifiant (mais plein de richesse) nether d'Incendium", - - - - - "Firestorm":"Firestorm", - "Charm of Extinguishing":"Charme de résistance au feu", - "Torch of Lunacy":"Torche de la folie", - "Necrotic Shield":"Bouclier nécrotique", - "Reacts to attacks with":"Réagis aux attaques avec", - "an explosion of death":"une explosion mortelle", - "Prismatic Shield":"Bouclier prismatique", - "Reflects attacks with a":"Reflète les attaques avec une", - "powerful spark of light":"puissante étincellede lumière", - "Infernal Wing":"Ailes infernales", - "Ghastling":"Bébé ghast", - "Destroys ghast fireballs that it can see.":"Détruit les boules de feu de ghasts", - "Loves to eat fire charges.":"Aime manger des boules de feu", - "Loyal but lazy":"Loyal mais Flémard", - - - "Chilling Blade":"Lame gelée", - "Freezes souls to the core":"Gèle les âmes", - "Blazing Hatchet":"Hachette brûlante", - "Multiplex Crossbow":"Arbalète multiple", - "Hefty Pickaxe":"Lourde pioche", - "Greatsword of Sacrifice":"L'épée du sacrifice", - "Drains the life of its wielder":"Vole de la vie à son porteur", - "to inflict massive damage":"pour infliger de massifs dégâts", - "Sentry's Wrath":"Colère de la sentinelle", - "Turns spectral arrows into":"Transforme les flèches spectrale en", - "a slow, powerful attack.":"de lentes mais puissantes attaques.", - "Beware the cooldown.":"Attention au compte à rebours.", - "Voltaic Trident":"Trident Voltaique", - "Unstable Powder":"Poudre instable", - "Emits a brilliant light when dropped":"Émet une lumière puissante quand lâché", - "Scarlet Dagger":"Dague écarlate", - "Drains the life of its slain victims":"Vole la vie à ses victimes", - "Withersbane":"Antiwither", - "Radiation Shield":"Bouclier radioactif", - "Releases radiation":"délivre de la radiation", - "when blocking an attack":"quand une attaque est bloquée", - - - - - - - - - - - - - - - - - - - - - - - "Use the Infernal Wing to upgrade your elytra in a Smithing Table": "Utilise une aile infernale pour améliorerles élytres dans une table de forge", - "Enter the chaotic Extreme Basalt Deltas":"Entrer dans les chaotiques deltas extrêmes de basalte", - "Kill a Desert Blaze on the boundary of light and dark to get both of its drops":"Tue un blaze du désert entre la lumière et les ténèbres pour obtenir ses deux butins", - "Put on some chain armor and use it to dispel a restless spirit":"Mets une armure de chaîne pour dissoudre les esprits", - "Storm a Forbidden Castle and kill every last piglin living inside":"Pille un château piglin et tue tous les piglin du château", - "Survive the Inferno's last spell and claim your reward.":"Survie la phase finale de l'inferno et obtient tes récompenses.", - "Give a Sentry a taste of its own medicine":"Rend la pareil à une sentinelle", - "Kill one of the odd Desert Blazes native to the Infernal Dunes":"Tuer un des blazes du désert dans les dunes infernales", - "Enter a Forbidden Castle at your own peril":"Entre dans un château piglin à ton propre péril", - "Mine the exposed ancient debris in the height of the Extreme Basalt Deltas":"Mine un des anciens débris exposés dans les hauteurs des deltas extrêmes de basalte", - "Enter a mutated Nether biome":"Trouve une variante d'un biome du nether", - "Feed a Ghastling its odd favorite food - fire charges - to make it follow you":"Donne une boule de feu au bébé ghast pour qu'il te suive", - "Stand at the intersection of four biomes in the Nether":"Va à l'intersection de quatre biomes du nether", - "Experience the blazing heat of the Infernal Dunes":"Résiste à la chaleur extrême des dunes infernales", - "Kill a Pipeline Sentry":"Tue une sentinelle de Tuyaux", - "Kill a restless spirit":"Tue un esprit", - "Brave the Quartz Flats' frozen lava seas":"Survie au sol de larmes des plaines des quartz", - "Find the hidden treasure in the Quartz Kitchen":"Trouve le trésor de la cuisine de quartz", - "Steal some loot from a Piglin Village":"Vole du butin d'un village de piglin", - "Survive the Inferno's \"Nether Sign「Last Stand」\" with no armor":"Survive the Inferno's \"Nether Sign「Last Stand」\" with no armor", - "Discover every type of loot in a Power Plant":"Trouve les cinq types de butin dans un réacteur nucléaire", - "Loot a Power Plant":"Pille un réacteur nucléaire", - "Loot the treasures of a Phantom Nest":"Pille les trésors d'un nid fantôme", - "Retrieve a Pipeline's hidden treasure":"Trouve le trésor secret du réseau de tuyaux", - "Enter a pipeline, but beware the dangerous sentry blazes":"Entre dans un réseau de Tuyaux, en faisant attention aux dangereux blazes sentinelles", - "Enter the Purified Dunes, homeland of the Hovering Inferno":"Entre des les dunes purifiées, terre natale de l'inferno", - "Beware the beautiful and deadly Quartz Flats":"Trouve les merveilleuses mais mortelles plaines de quartz", - "Kill a ghast on its home turf above the frozen lava seas":"Tue un ghast dans son habitat naturel, sur le sol de larmes", - "You can't kill the Inferno. Just survive to win.":"Tu ne peux pas tuer l'inferno. Survie.", - "Get poisoned by a toxic slime":"Fait toi empoisonner par un slime toxique", - "Discover every single Nether biome":"Découvre tous les biomes du nether", - "Afflict a ghast with Speed, Regeneration and Invisibility -- then kill it to obtain its Ghastling":"Applique les effets vitesse, régénération et invisibilité à un ghast, pour ensuite le tuer pour récupérer son bébé ghast", - "Sacrifice a nether star at an altar to summon the Hovering Inferno":"Sacrifice une étoile du nether à un altar pour invoquer l'inferno", - "Kill the skeleton chef Torte and loot his kitchen":"Tue le squelette Chef Torte et pille ça cuisine", - "Enter the nuclear wastelands of the Toxic Heap":"Entre dans les terres nucléaires des terres toxiques", - "Get hit by a Sentry's lightning attack":"Fait toi toucher par une attaque électrique d'un sentinelle", - "Enter the Withered Forest, ancestral battleground of the Piglins and Wither Skeletons":"Entre dans la forêt wither, ancient champs de bataille entre les piglins et les wither squelettes" -} \ No newline at end of file diff --git a/assets/minecraft/lang/ru_ru.json b/assets/minecraft/lang/ru_ru.json deleted file mode 100755 index ab2cff8..0000000 --- a/assets/minecraft/lang/ru_ru.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "language.name": "Russian", - "language.region": "Russia", - "language.code": "ru_ru", - - "Forged in Flames": "Выкованный в огне", - "Hellfire Mantle": "Мантия Адского Пламени", - "Border of Life": "Граница Жизни", - "Ghostbuster": "Охотник за привидениями", - "The Conqueror": "Завоеватель", - "Fallen to Ashes": "Превращенный в пепел", - "Duel of the Fates": "Дуэль судеб", - "Light-Sensitive": "Светочувствительный", - "In the Hall of the Piglin King": "В Зале Короля свиней", - "Treacherous Heights": "Коварные высоты", - "Strange Biomes": "Странные Биомы", - "Feed the Beast": "Накорми зверя", - "GLORY TO INCENDZKA!": "СЛАВА ЗАЖИГАЛКЕ!", - "Darude - Firestorm": "Дарудэ огненная буря", - "Ceci n'est pas un blaze": "Это не Блейз", - "Apparitions": "Появления", - "Kitchen's Treasure": "Сокровище кухни", - "Piglin Pillage": "Поросячий Грабеж", - "Lunatic Mode": "Безумный режим", - "Mystic Wisdom": "Мистическая мудрость", - "Nuclear Fusion": "Термоядерная реакция", - "Phantom Menace": "Призрачная угроза", - "Plumber's Plunder": "Грабеж водопроводчика", - "Pipe Dream": "Несбыточная мечта", - "Hellish Paradise": "Адский Рай", - "The Floor is Tears": "Пол - это слезы", - "Ghast Buster":"Гаст Бастер", - "Run.": "Бежать.", - "Toxic Personality": "Токсичная Личность", - "Soul Searcher": "Искатель Душ", - "\"Special\" Delivery": "\"Специальная\" Доставка", - "Risen from Fire": "Восставший из огня", - "You Fool!": "Ты Дурак!", - "UNLIMITED POWER!!!": "НЕОГРАНИЧЕННАЯ МОЩНОСТЬ!!!", - "Ancient Battlefield": "Древнее поле битвы", - "Sacred Sands":"Священные пески", - - "Incendium":"Incendium", - "Explore the terrifying, and rewarding, Incendium Nether":"Исследуйте ужасающую и полезный Нижний мир", - - - "Firestorm":"Огненная буря", - "Charm of Extinguishing":"Амулет тушения", - "Torch of Lunacy":"Факел безумия", - "Necrotic Shield":"Некротический Щит", - "Reacts to attacks with":"Реагирует с помощью атаки", - "an explosion of death":"Взрыв смерти", - "Prismatic Shield":"Призматический Щит", - "Reflects attacks with a":"Отражает с помощью атаки", - "powerful spark of light":"Мощная искра света", - "Infernal Wing":"Адское Крыло", - "Ghastling":"Гастлинг", - "Destroys ghast fireballs that it can see.":"Уничтожает жуткие огненные шары, которые видит.", - "Loves to eat fire charges.":"Обожает есть огненные заряды.", - "Loyal but lazy":"Верный, но ленивый", - - "Chilling Blade":"Леденящий клинок", - "Freezes souls to the core":"Замораживает души до глубины души", - "Blazing Hatchet":"Пылающий топор", - "Multiplex Crossbow":"Мультиплексный Арбалет", - "Hefty Pickaxe":"Здоровенная кирка", - "Greatsword of Sacrifice":"Большой меч жертвоприношения", - "Drains the life of its wielder":"Истощает жизнь владельца", - "to inflict massive damage":"чтобы нанести огромный урон", - "Sentry's Wrath":"Гнев часового", - "Turns spectral arrows into":"Превращает спектральные стрелки в", - "a slow, powerful attack.":"медленная, мощная атака.", - "Beware the cooldown.":"Остерегайтесь перезарядки.", - "Voltaic Trident":"Вольтовский Трезубец", - "Unstable Powder":"Нестабильный Порошок", - "Emits a brilliant light when dropped":"Излучает яркий свет при падении", - "Scarlet Dagger":"Алый кинжал", - "Drains the life of its slain victims":"Высасывает жизнь из своих убитых жертв", - "Withersbane":"Сухоубийца", - "Radiation Shield":"Радиационный Щит", - "Releases radiation":"Испускает радиацию", - "Feel its electrical power":"Почувствуйте его электрическую мощь", - "when blocking an attack":"при блокировании атаки", - - - - - - - - - - - - "Use the Infernal Wing to upgrade your elytra in a Smithing Table": "Используйте адское крыло, чтобы обновить свои надкрылья в Кузнечном столе", - "Enter the chaotic Extreme Basalt Deltas":"Войдите в хаотические экстремальные базальтовые дельты", - "Kill a Desert Blaze on the boundary of light and dark to get both of its drops":"Убейте пустынного блейза на границе света и тьмы, чтобы получить обе его капли", - "Put on some chain armor and use it to dispel a restless spirit":"Наденьте кольчугу и используйте ее, чтобы рассеять беспокойный дух.", - "Storm a Forbidden Castle and kill every last piglin living inside":"Штурмуйте Запретный замок и убейте всех свиней, живущих внутри", - "Survive the Inferno's last spell and claim your reward.":"Переживите последнее заклинание Инферно босса и заберите свою награду.", - "Give a Sentry a taste of its own medicine":"Дайте часовому попробовать его собственное лекарство", - "Kill one of the odd Desert Blazes native to the Infernal Dunes":"Убейте одного странного пустынного Блейза, обитающих в Адских дюнах.", - "Enter a Forbidden Castle at your own peril":"Войдите в Запретный замок на свой страх и риск", - "Mine the exposed ancient debris in the height of the Extreme Basalt Deltas":"Добывайте обнаженные древние обломки на высоте Экстремальных базальтовых дельт.", - "Enter a mutated Nether biome":"Войдите в мутировавший Нижний биом", - "Feed a Ghastling its odd favorite food - fire charges - to make it follow you":"Накормите привидения его странной любимой едой - огненными зарядами - чтобы он преследовал Вас", - "Stand at the intersection of four biomes in the Nether":"Встаньте на пересечении четырех биомов в Незере", - "Experience the blazing heat of the Infernal Dunes":"Испытайте пылающий зной Адских дюн.", - "Kill a Pipeline Sentry":"Убить часового трубопровода", - "Kill a restless spirit":"Убить беспокойного духа", - "Brave the Quartz Flats' frozen lava seas":"Отваживайтесь на замерзшие лавовые моря кварцевых равнин", - "Find the hidden treasure in the Quartz Kitchen":"Найдите спрятанное сокровище в кварцевой кухне", - "Steal some loot from a Piglin Village":"Украсть добычу из Деревни Пиглинов", - "Survive the Inferno's \"Nether Sign「Last Stand」\" with no armor":"Выживите в бою с Инферно (Последняя битва) без брони", - "Discover every type of loot in a Power Plant":"Откройте для себя каждый тип добычи на Электростанции", - "Loot a Power Plant":"Ограбить Электростанцию", - "Loot the treasures of a Phantom Nest":"Собери сокровища в Фантомном гнезде", - "Retrieve a Pipeline's hidden treasure":"Найдите спрятанное сокровище трубопровода", - "Enter a pipeline, but beware the dangerous sentry blazes":"Войдите в трубопровод, но остерегайтесь опасных блейзов", - "Enter the Purified Dunes, homeland of the Hovering Inferno":"Войдите в Очищенные дюны, гробницу босса Инферно", - "Beware the beautiful and deadly Quartz Flats":"Остерегайтесь красивых и смертоносных кварцевых квартир", - "Kill a ghast on its home turf above the frozen lava seas":"Убейте гаста на его родной земле над замерзшими морями лавы", - "You can't kill the Inferno. Just survive to win.":"Ты не можешь убить Инферно. Просто выживите, чтобы победить.", - "Get poisoned by a toxic slime":"Отравиться токсичной слизью", - "Discover every single Nether biome":"Откройте для себя каждый отдельный Незер биом", - "Afflict a ghast with Speed, Regeneration and Invisibility -- then kill it to obtain its Ghastling":"Нанесите гасту скорость, регенерацию и невидимостью - затем убейте его, чтобы получить его Гастлинг", - "Sacrifice a nether star at an altar to summon the Hovering Inferno":"Принесите в жертву Незер звезду на алтаре, чтобы вызвать босса Инферно.", - "Kill the skeleton chef Torte and loot his kitchen":"Убейте скелета шеф-повара Торта и разграбьте его кухню", - "Enter the nuclear wastelands of the Toxic Heap":"Войдите в ядерные пустоши Токсичной кучи", - "Get hit by a Sentry's lightning attack":"Получите удар от молниеносной атаки часового", - "Enter the Withered Forest, ancestral battleground of the Piglins and Wither Skeletons":"Войдите в Увядший лес, древнее поле битвы Пиглинов и Скелетов-иссушителей." -} \ No newline at end of file diff --git a/data/incendium/advancements/ash_barrens/conquer_castle.json b/data/incendium/advancements/ash_barrens/conquer_castle.json old mode 100755 new mode 100644 index 8b2a49f..60e353b --- a/data/incendium/advancements/ash_barrens/conquer_castle.json +++ b/data/incendium/advancements/ash_barrens/conquer_castle.json @@ -2,14 +2,13 @@ "display": { "icon": { "item": "minecraft:player_head", - "nbt": "{display:{Name:'{\"text\":\"Crown\"}'},SkullOwner:{Id:[I;646760342,1356162047,1982425560,850488039],Properties:{textures:[{Value:'eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDU1ODdkYTdmZTczMzZlOGFiOWY3OTFlYTVlMmNmYzhhODI3Y2E5NTk1NjdlYjlkNTNhNjQ3YmFiZjk0OGQ1In19fQ=='}]}}}" + "nbt": "{display:{Name:'{\"text\":\"Crown\"}'},SkullOwner:'{Id:[I;646760342,1356162047,1982425560,850488039],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDU1ODdkYTdmZTczMzZlOGFiOWY3OTFlYTVlMmNmYzhhODI3Y2E5NTk1NjdlYjlkNTNhNjQ3YmFiZjk0OGQ1In19fQ==\"}]}}'}" }, "title": { - "translate": "The Conqueror" + "translate": "%1$s%4733088$s","with":["The Conqueror",{"translate":"incendium.advancement.ash_barrens.conquer_castle.title"}] }, "description": { - "translate": "Storm a Forbidden Castle and kill every last piglin living inside" - }, + "translate": "%1$s%4733088$s","with":["Storm a Forbidden Castle and kill every last piglin living inside",{"translate":"incendium.advancement.ash_barrens.conquer_castle.desc"}] }, "frame": "challenge", "show_toast": true, "announce_to_chat": true, diff --git a/data/incendium/advancements/ash_barrens/duel_of_the_fates.json b/data/incendium/advancements/ash_barrens/duel_of_the_fates.json old mode 100755 new mode 100644 index c3f2e4e..7c40226 --- a/data/incendium/advancements/ash_barrens/duel_of_the_fates.json +++ b/data/incendium/advancements/ash_barrens/duel_of_the_fates.json @@ -4,10 +4,10 @@ "item": "crossbow" }, "title": { - "translate": "Duel of the Fates" + "translate": "%1$s%4733088$s","with":["Duel of the Fates",{"translate":"incendium.advancement.ash_barrens.duel_of_the_fates.title"}] }, "description": { - "translate": "Give a Sentry a taste of its own medicine" + "translate": "%1$s%4733088$s","with":["Give a Sentry a taste of its own medicine",{"translate":"incendium.advancement.ash_barrens.duel_of_the_fates.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/advancements/ash_barrens/enter_castle.json b/data/incendium/advancements/ash_barrens/enter_castle.json old mode 100755 new mode 100644 index d64a2bd..dbfe63e --- a/data/incendium/advancements/ash_barrens/enter_castle.json +++ b/data/incendium/advancements/ash_barrens/enter_castle.json @@ -5,10 +5,10 @@ "nbt": "{Enchantments:[{}]}" }, "title": { - "translate": "In the Hall of the Piglin King" + "translate": "%1$s%4733088$s","with":["In the Hall of the Piglin King",{"translate":"incendium.advancement.ash_barrens.enter_castle.title"}] }, "description": { - "translate": "In the Golden Age, a great King ruled this castle. But he was betrayed, cursed, and exiled from his Kingdom. This is what remains." + "translate": "%1$s%4733088$s","with":["In the Golden Age, a great King ruled this castle. But he was betrayed, cursed, and exiled from his Kingdom. This is what remains.",{"translate":"incendium.advancement.ash_barrens.enter_castle.desc"}] }, "frame": "goal", "show_toast": true, diff --git a/data/incendium/advancements/ash_barrens/root.json b/data/incendium/advancements/ash_barrens/root.json index b7b4f28..226abf7 100644 --- a/data/incendium/advancements/ash_barrens/root.json +++ b/data/incendium/advancements/ash_barrens/root.json @@ -4,10 +4,10 @@ "item": "smooth_basalt" }, "title": { - "translate": "The Dust Settles" + "translate": "%1$s%4733088$s","with":["The Dust Settles",{"translate":"incendium.advancement.ash_barrens.root.title"}] }, "description": { - "translate": "Enter the Ash Barrens, the forgotten home to the Forbidden Castle" + "translate": "%1$s%4733088$s","with":["Enter the Ash Barrens, the forgotten home to the Forbidden Castle",{"translate":"incendium.advancement.ash_barrens.root.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/advancements/infernal_dunes/border_of_life.json b/data/incendium/advancements/infernal_dunes/border_of_life.json old mode 100755 new mode 100644 index 65c5074..7d6b1df --- a/data/incendium/advancements/infernal_dunes/border_of_life.json +++ b/data/incendium/advancements/infernal_dunes/border_of_life.json @@ -4,10 +4,10 @@ "item": "redstone_lamp" }, "title": { - "translate": "Border of Life" + "translate": "%1$s%4733088$s","with":["Border of Life",{"translate":"incendium.advancement.infernal_dunes.border_of_life.title"}] }, "description": { - "translate": "Kill a Desert Blaze on the boundary of light and dark to get both of its drops" + "translate": "%1$s%4733088$s","with":["Kill a Desert Blaze on the boundary of light and dark to get both of its drops",{"translate":"incendium.advancement.infernal_dunes.border_of_life.desc"}] }, "frame": "challenge", "show_toast": true, diff --git a/data/incendium/advancements/infernal_dunes/dune_blaze.json b/data/incendium/advancements/infernal_dunes/dune_blaze.json old mode 100755 new mode 100644 index f1b774a..2d86370 --- a/data/incendium/advancements/infernal_dunes/dune_blaze.json +++ b/data/incendium/advancements/infernal_dunes/dune_blaze.json @@ -4,10 +4,10 @@ "item": "redstone" }, "title": { - "translate": "Light-Sensitive" + "translate": "%1$s%4733088$s","with":["Light-Sensitive",{"translate":"incendium.advancement.infernal_dunes.dune_blaze.title"}] }, "description": { - "translate": "Kill one of the odd Desert Blazes native to the Infernal Dunes" + "translate": "%1$s%4733088$s","with":["Kill one of the odd Desert Blazes native to the Infernal Dunes",{"translate":"incendium.advancement.infernal_dunes.dune_blaze.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/advancements/infernal_dunes/inferno/armored_wings.json b/data/incendium/advancements/infernal_dunes/inferno/armored_wings.json old mode 100755 new mode 100644 index a461022..eb41f99 --- a/data/incendium/advancements/infernal_dunes/inferno/armored_wings.json +++ b/data/incendium/advancements/infernal_dunes/inferno/armored_wings.json @@ -4,10 +4,10 @@ "item": "minecraft:elytra" }, "title": { - "translate": "Forged in Flames" + "translate": "%1$s%4733088$s","with":["Forged in Flames",{"translate":"incendium.advancement.infernal_dunes.inferno.armored_wings.title"}] }, "description": { - "translate": "Use the Infernal Feather to upgrade your elytra in a Smithing Table" + "translate": "%1$s%4733088$s","with":["Use the Infernal Feather to upgrade your elytra in a Smithing Table",{"translate":"incendium.advancement.infernal_dunes.inferno.armored_wings.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/advancements/infernal_dunes/inferno/kill.json b/data/incendium/advancements/infernal_dunes/inferno/kill.json old mode 100755 new mode 100644 index 0ce435e..b583e2b --- a/data/incendium/advancements/infernal_dunes/inferno/kill.json +++ b/data/incendium/advancements/infernal_dunes/inferno/kill.json @@ -5,10 +5,10 @@ "nbt": "{Enchantments:[]}" }, "title": { - "translate": "Fallen to Ashes" + "translate": "%1$s%4733088$s","with":["Fallen to Ashes",{"translate":"incendium.advancement.infernal_dunes.inferno.kill.title"}] }, "description": { - "translate": "Survive the Inferno's last spell and claim your reward" + "translate": "%1$s%4733088$s","with":["Survive the Inferno's last spell and claim your reward",{"translate":"incendium.advancement.infernal_dunes.inferno.kill.desc"}] }, "frame": "challenge", "show_toast": true, diff --git a/data/incendium/advancements/infernal_dunes/inferno/lunatic_mode.json b/data/incendium/advancements/infernal_dunes/inferno/lunatic_mode.json old mode 100755 new mode 100644 index 4e70774..4b67c0a --- a/data/incendium/advancements/infernal_dunes/inferno/lunatic_mode.json +++ b/data/incendium/advancements/infernal_dunes/inferno/lunatic_mode.json @@ -5,10 +5,10 @@ "nbt": "{Enchantments:[]}" }, "title": { - "translate": "Lunatic Mode" + "translate": "%1$s%4733088$s","with":["Lunatic Mode",{"translate":"incendium.advancement.infernal_dunes.inferno.lunatic_mode.title"}] }, "description": { - "translate": "Survive the Inferno's final phase with no armor" + "translate": "%1$s%4733088$s","with":["Survive the Inferno's final phase with no armor",{"translate":"incendium.advancement.infernal_dunes.inferno.lunatic_mode.desc"}] }, "frame": "challenge", "show_toast": true, diff --git a/data/incendium/advancements/infernal_dunes/inferno/root.json b/data/incendium/advancements/infernal_dunes/inferno/root.json old mode 100755 new mode 100644 index 015acff..9868422 --- a/data/incendium/advancements/infernal_dunes/inferno/root.json +++ b/data/incendium/advancements/infernal_dunes/inferno/root.json @@ -5,10 +5,10 @@ "nbt": "{Enchantments:[{}]}" }, "title": { - "translate": "Beyond the Embers" + "translate": "%1$s%4733088$s","with":["Beyond the Embers",{"translate":"incendium.advancement.infernal_dunes.inferno.root.title"}] }, "description": { - "translate": "The shrine... demands a sacrifice." + "translate": "%1$s%4733088$s","with":["The shrine... demands a sacrifice",{"translate":"incendium.advancement.infernal_dunes.inferno.root.desc"}] }, "frame": "goal", "show_toast": true, diff --git a/data/incendium/advancements/infernal_dunes/inferno/run.json b/data/incendium/advancements/infernal_dunes/inferno/run.json old mode 100755 new mode 100644 index c1f02bb..1eab992 --- a/data/incendium/advancements/infernal_dunes/inferno/run.json +++ b/data/incendium/advancements/infernal_dunes/inferno/run.json @@ -4,10 +4,10 @@ "item": "blaze_powder" }, "title": { - "translate": "Run." + "translate": "%1$s%4733088$s","with":["Run.",{"translate":"incendium.advancement.infernal_dunes.inferno.run.title"}] }, "description": { - "translate": "You can't kill the Inferno. Just survive to win." + "translate": "%1$s%4733088$s","with":["You can't kill the Inferno. Just survive to win",{"translate":"incendium.advancement.infernal_dunes.inferno.run.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/advancements/infernal_dunes/inferno/summon.json b/data/incendium/advancements/infernal_dunes/inferno/summon.json old mode 100755 new mode 100644 index 194a814..6fd6b66 --- a/data/incendium/advancements/infernal_dunes/inferno/summon.json +++ b/data/incendium/advancements/infernal_dunes/inferno/summon.json @@ -2,13 +2,13 @@ "display": { "icon": { "item": "player_head", - "nbt": "{display:{Name:'{\"text\":\"Hovering Inferno\"}'},SkullOwner:{Id:[I;259043974,944589788,-1170011413,-1573252200],Properties:{textures:[{Value:'eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzAyNzcwNGZmMDFiZTk0NzI5YTJkYTAyNjIyYTM4Y2ZiOWU4Yjg1ZWRkZjMyMmZmZDY4OWFlODA1ZWUxMWM3ZCJ9fX0='}]}}}" + "nbt": "{display:{Name:'{\"text\":\"Hovering Inferno\"}'},SkullOwner:'{Id:[I;259043974,944589788,-1170011413,-1573252200],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzAyNzcwNGZmMDFiZTk0NzI5YTJkYTAyNjIyYTM4Y2ZiOWU4Yjg1ZWRkZjMyMmZmZDY4OWFlODA1ZWUxMWM3ZCJ9fX0=\"}]}}'}" }, "title": { - "translate": "Risen from Fire" + "translate": "%1$s%4733088$s","with":["Risen from Fire",{"translate":"incendium.advancement.infernal_dunes.inferno.summon.title"}] }, "description": { - "translate": "Sacrifice a nether star at an altar to summon the Hovering Inferno" + "translate": "%1$s%4733088$s","with":["Sacrifice a nether star at an altar to summon the Hovering Inferno",{"translate":"incendium.advancement.infernal_dunes.inferno.summon.desc"}] }, "frame": "goal", "show_toast": true, diff --git a/data/incendium/advancements/infernal_dunes/pipeline/kill_sentry.json b/data/incendium/advancements/infernal_dunes/pipeline/kill_sentry.json old mode 100755 new mode 100644 index 5705b38..ad5e445 --- a/data/incendium/advancements/infernal_dunes/pipeline/kill_sentry.json +++ b/data/incendium/advancements/infernal_dunes/pipeline/kill_sentry.json @@ -2,13 +2,13 @@ "display": { "icon": { "item": "player_head", - "nbt": "{SkullOwner:{Id:[I;2095810738,2136949657,-1413910424,622570141],Properties:{textures:[{Value:'eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjc4ZWYyZTRjZjJjNDFhMmQxNGJmZGU5Y2FmZjEwMjE5ZjViMWJmNWIzNWE0OWViNTFjNjQ2Nzg4MmNiNWYwIn19fQ=='}]}}}" + "nbt": "{SkullOwner:'{Id:[I;2095810738,2136949657,-1413910424,622570141],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjc4ZWYyZTRjZjJjNDFhMmQxNGJmZGU5Y2FmZjEwMjE5ZjViMWJmNWIzNWE0OWViNTFjNjQ2Nzg4MmNiNWYwIn19fQ==\"}]}}'}" }, "title": { - "translate": "Ceci n'est pas un blaze" + "translate": "%1$s%4733088$s","with":["Ceci n'est pas un blaze",{"translate":"incendium.advancement.infernal_dunes.pipeline.kill_sentry.title"}] }, "description": { - "translate": "Extinguish a Pipeline Sentry" + "translate": "%1$s%4733088$s","with":["Extinguish a Pipeline Sentry",{"translate":"incendium.advancement.infernal_dunes.pipeline.kill_sentry.desc"}] }, "frame": "goal", "show_toast": true, diff --git a/data/incendium/advancements/infernal_dunes/pipeline/pipeline_treasure.json b/data/incendium/advancements/infernal_dunes/pipeline/pipeline_treasure.json old mode 100755 new mode 100644 index 7cdec3d..644e3f0 --- a/data/incendium/advancements/infernal_dunes/pipeline/pipeline_treasure.json +++ b/data/incendium/advancements/infernal_dunes/pipeline/pipeline_treasure.json @@ -4,10 +4,10 @@ "item": "barrel" }, "title": { - "translate": "Plumber's Plunder" + "translate": "%1$s%4733088$s","with":["Plumber's Plunder",{"translate":"incendium.advancement.infernal_dunes.pipeline.pipeline_treasure.title"}] }, "description": { - "translate": "Retrieve a Pipeline's hidden treasure" + "translate": "%1$s%4733088$s","with":["Retrieve a Pipeline's hidden treasure",{"translate":"incendium.advancement.infernal_dunes.pipeline.pipeline_treasure.desc"}] }, "frame": "challenge", "show_toast": true, @@ -19,7 +19,7 @@ "requirement": { "trigger": "minecraft:player_generates_container_loot", "conditions": { - "loot_table": "incendium:steam/treasure" + "loot_table": "incendium:pipeline/treasure" } } } diff --git a/data/incendium/advancements/infernal_dunes/pipeline/root.json b/data/incendium/advancements/infernal_dunes/pipeline/root.json old mode 100755 new mode 100644 index 21b9631..7944f4f --- a/data/incendium/advancements/infernal_dunes/pipeline/root.json +++ b/data/incendium/advancements/infernal_dunes/pipeline/root.json @@ -4,10 +4,10 @@ "item": "hopper" }, "title": { - "translate": "Pipe Dream" + "translate": "%1$s%4733088$s","with":["Pipe Dream",{"translate":"incendium.advancement.infernal_dunes.pipeline.root.title"}] }, "description": { - "translate": "Enter a pipeline, but beware the dangerous sentry blazes" + "translate": "%1$s%4733088$s","with":["Enter a pipeline, but beware the dangerous sentry blazes",{"translate":"incendium.advancement.infernal_dunes.pipeline.root.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/advancements/infernal_dunes/pipeline/unlimited_power.json b/data/incendium/advancements/infernal_dunes/pipeline/unlimited_power.json old mode 100755 new mode 100644 index 4f2f9b0..6c8da6b --- a/data/incendium/advancements/infernal_dunes/pipeline/unlimited_power.json +++ b/data/incendium/advancements/infernal_dunes/pipeline/unlimited_power.json @@ -2,13 +2,13 @@ "display": { "icon": { "item": "player_head", - "nbt": "{SkullOwner:{Id:[I;1713112552,-376224596,-1490916748,-546685089],Properties:{textures:[{Value:'eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjE0NmI5NmU0MzEwMTllNzEzYmUzNmQwZTNhYzFkNDg0ZDNiY2U3MjNmNDRlOGJmZTM1YmVlN2NkMGY0NzkzNCJ9fX0='}]}}}" + "nbt": "{SkullOwner:'{Id:[I;1713112552,-376224596,-1490916748,-546685089],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjE0NmI5NmU0MzEwMTllNzEzYmUzNmQwZTNhYzFkNDg0ZDNiY2U3MjNmNDRlOGJmZTM1YmVlN2NkMGY0NzkzNCJ9fX0=\"}]}}'}" }, "title": { - "translate": "UNLIMITED POWER!!!" + "translate": "%1$s%4733088$s","with":["UNLIMITED POWER!!!",{"translate":"incendium.advancement.infernal_dunes.pipeline.unlimited_power.title"}] }, "description": { - "translate": "Get hit by a Sentry's lightning attack" + "translate": "%1$s%4733088$s","with":["Get hit by a Sentry's lightning attack",{"translate":"incendium.advancement.infernal_dunes.pipeline.unlimited_power.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/advancements/infernal_dunes/root.json b/data/incendium/advancements/infernal_dunes/root.json old mode 100755 new mode 100644 index 858a43f..1af77b4 --- a/data/incendium/advancements/infernal_dunes/root.json +++ b/data/incendium/advancements/infernal_dunes/root.json @@ -4,10 +4,10 @@ "item": "red_sand" }, "title": { - "translate": "Darude - Firestorm" + "translate": "%1$s%4733088$s","with":["Darude - Firestorm",{"translate":"incendium.advancement.infernal_dunes.root.title"}] }, "description": { - "translate": "Experience the blazing heat of the Infernal Dunes" + "translate": "%1$s%4733088$s","with":["Experience the blazing heat of the Infernal Dunes",{"translate":"incendium.advancement.infernal_dunes.root.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/advancements/misc/loot_piglin_village.json b/data/incendium/advancements/misc/loot_piglin_village.json old mode 100755 new mode 100644 index ed09472..d3016cd --- a/data/incendium/advancements/misc/loot_piglin_village.json +++ b/data/incendium/advancements/misc/loot_piglin_village.json @@ -4,10 +4,10 @@ "item": "golden_pickaxe" }, "title": { - "translate": "Piglin Pillage" + "translate": "%1$s%4733088$s","with":["Piglin Pillage",{"translate":"incendium.advancement.misc.loot_piglin_village.title"}] }, "description": { - "translate": "Steal some loot from a Piglin Village" + "translate": "%1$s%4733088$s","with":["Steal some loot from a Piglin Village",{"translate":"incendium.advancement.misc.loot_piglin_village.desc"}] }, "frame": "goal", "show_toast": true, diff --git a/data/incendium/advancements/misc/root.json b/data/incendium/advancements/misc/root.json old mode 100755 new mode 100644 index 06dbfaa..e772bda --- a/data/incendium/advancements/misc/root.json +++ b/data/incendium/advancements/misc/root.json @@ -4,10 +4,10 @@ "item": "minecraft:golden_boots" }, "title": { - "translate": "Strange Biomes" + "translate": "%1$s%4733088$s","with":["Strange Biomes",{"translate":"incendium.advancement.misc.root.title"}] }, "description": { - "translate": "Visit any Incendium biome" + "translate": "%1$s%4733088$s","with":["Visit any Incendium biome",{"translate":"incendium.advancement.misc.root.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/advancements/misc/ruined_lab.json b/data/incendium/advancements/misc/ruined_lab.json old mode 100755 new mode 100644 index df79881..5df9279 --- a/data/incendium/advancements/misc/ruined_lab.json +++ b/data/incendium/advancements/misc/ruined_lab.json @@ -5,10 +5,10 @@ "nbt": "{Potion: \"minecraft:strong_harming\"}" }, "title": { - "translate": "Alchemical Experiments" + "translate": "%1$s%4733088$s","with":["Alchemical Experiments",{"translate":"incendium.advancement.misc.ruined_lab.title"}] }, "description": { - "translate": "The piglin's experiments backfired leading to a dangerous situation" + "translate": "%1$s%4733088$s","with":["The piglin's experiments backfired leading to a dangerous situation",{"translate":"incendium.advancement.misc.ruined_lab.desc"}] }, "frame": "goal", "show_toast": true, diff --git a/data/incendium/advancements/misc/soul_searcher.json b/data/incendium/advancements/misc/soul_searcher.json old mode 100755 new mode 100644 index 7c16ccb..1b5ce39 --- a/data/incendium/advancements/misc/soul_searcher.json +++ b/data/incendium/advancements/misc/soul_searcher.json @@ -5,10 +5,10 @@ "nbt": "{Enchantments:[]}" }, "title": { - "translate": "Soul Searcher" + "translate": "%1$s%4733088$s","with":["Soul Searcher",{"translate":"incendium.advancement.misc.soul_searcher.title"}] }, "description": { - "translate": "Discover every single Incendium biome" + "translate": "%1$s%4733088$s","with":["Discover every single Incendium biome",{"translate":"incendium.advancement.misc.soul_searcher.desc"}] }, "frame": "challenge", "show_toast": true, diff --git a/data/incendium/advancements/quartz_flats/feed_ghastling.json b/data/incendium/advancements/quartz_flats/feed_ghastling.json old mode 100755 new mode 100644 index 6b76183..229ce40 --- a/data/incendium/advancements/quartz_flats/feed_ghastling.json +++ b/data/incendium/advancements/quartz_flats/feed_ghastling.json @@ -4,10 +4,10 @@ "item": "minecraft:fire_charge" }, "title": { - "translate": "Feed the Beast" + "translate": "%1$s%4733088$s","with":["Feed the Beast",{"translate":"incendium.advancement.quartz_flats.feed_ghastling.title"}] }, "description": { - "translate": "Feed a Ghastling its odd favorite food - fire charges - to toggle it following you" + "translate": "%1$s%4733088$s","with":["Feed a Ghastling its odd favorite food - fire charges - to toggle it following you",{"translate":"incendium.advancement.quartz_flats.feed_ghastling.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/advancements/quartz_flats/floor_is_tears.json b/data/incendium/advancements/quartz_flats/floor_is_tears.json old mode 100755 new mode 100644 index aa7c1a8..112c9bc --- a/data/incendium/advancements/quartz_flats/floor_is_tears.json +++ b/data/incendium/advancements/quartz_flats/floor_is_tears.json @@ -4,10 +4,10 @@ "item": "quartz_block" }, "title": { - "translate": "The Floor is Tears" + "translate": "%1$s%4733088$s","with":["The Floor is Tears",{"translate":"incendium.advancement.quartz_flats.floor_is_tears.title"}] }, "description": { - "translate": "Brave the Quartz Flats' frozen lava seas" + "translate": "%1$s%4733088$s","with":["Brave the Quartz Flats' frozen lava seas",{"translate":"incendium.advancement.quartz_flats.floor_is_tears.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/advancements/quartz_flats/ghast_buster.json b/data/incendium/advancements/quartz_flats/ghast_buster.json old mode 100755 new mode 100644 index dce6fad..91d5eec --- a/data/incendium/advancements/quartz_flats/ghast_buster.json +++ b/data/incendium/advancements/quartz_flats/ghast_buster.json @@ -4,10 +4,10 @@ "item": "ghast_tear" }, "title": { - "translate": "Ghast Buster" + "translate": "%1$s%4733088$s","with":["Ghast Buster",{"translate":"incendium.advancement.quartz_flats.ghast_buster.title"}] }, "description": { - "translate": "Kill a ghast on its home turf above the frozen lava seas" + "translate": "%1$s%4733088$s","with":["Kill a ghast on its home turf above the frozen lava seas",{"translate":"incendium.advancement.quartz_flats.ghast_buster.desc"}] }, "frame": "goal", "show_toast": true, diff --git a/data/incendium/advancements/quartz_flats/rescue_mission.json b/data/incendium/advancements/quartz_flats/rescue_mission.json old mode 100755 new mode 100644 index adbd798..63941d5 --- a/data/incendium/advancements/quartz_flats/rescue_mission.json +++ b/data/incendium/advancements/quartz_flats/rescue_mission.json @@ -3,8 +3,12 @@ "icon": { "item": "minecraft:iron_bars" }, - "title": "Rescue Mission", - "description": "Enter the Quartz Tower, the prison of the Ghastling", + "title": { + "translate": "%1$s%4733088$s","with":["Rescue Mission",{"translate":"incendium.advancement.quartz_flats.rescue_mission.title"}] + }, + "description": { + "translate": "%1$s%4733088$s","with":["Enter the Quartz Tower, the prison of the Ghastlings",{"translate":"incendium.advancement.quartz_flats.rescue_mission.desc"}] + }, "frame": "task", "show_toast": true, "announce_to_chat": true, diff --git a/data/incendium/advancements/quartz_flats/root.json b/data/incendium/advancements/quartz_flats/root.json old mode 100755 new mode 100644 index 9182ab2..9576f83 --- a/data/incendium/advancements/quartz_flats/root.json +++ b/data/incendium/advancements/quartz_flats/root.json @@ -4,10 +4,10 @@ "item": "smooth_quartz" }, "title": { - "translate": "Hellish Paradise" + "translate": "%1$s%4733088$s","with":["Hellish Paradise",{"translate":"incendium.advancement.quartz_flats.root.title"}] }, "description": { - "translate": "Beware the beautiful and deadly Quartz Flats" + "translate": "%1$s%4733088$s","with":["Beware the beautiful and deadly Quartz Flats",{"translate":"incendium.advancement.quartz_flats.root.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/advancements/quartz_flats/sanctum/root.json b/data/incendium/advancements/quartz_flats/sanctum/root.json old mode 100755 new mode 100644 index 820bd6e..bcaf5a0 --- a/data/incendium/advancements/quartz_flats/sanctum/root.json +++ b/data/incendium/advancements/quartz_flats/sanctum/root.json @@ -5,10 +5,10 @@ "nbt": "{Enchantments:[{}]}" }, "title": { - "translate": "An Illager Refuge?" + "translate": "%1$s%4733088$s","with":["An Illager Refuge?",{"translate":"incendium.advancement.quartz_flats.sanctum.root.title"}] }, "description": { - "translate": "The Illagers' Sanctum might not be so holy..." + "translate": "%1$s%4733088$s","with":["The Illagers' Sanctum might not be so holy...",{"translate":"incendium.advancement.quartz_flats.sanctum.root.desc"}] }, "frame": "goal", "show_toast": true, diff --git a/data/incendium/advancements/quartz_flats/torte/kitchen_treasure.json b/data/incendium/advancements/quartz_flats/torte/kitchen_treasure.json old mode 100755 new mode 100644 index 0315248..8715565 --- a/data/incendium/advancements/quartz_flats/torte/kitchen_treasure.json +++ b/data/incendium/advancements/quartz_flats/torte/kitchen_treasure.json @@ -4,10 +4,10 @@ "item": "trapped_chest" }, "title": { - "translate": "Kitchen's Treasure" + "translate": "%1$s%4733088$s","with":["Kitchen's Treasure",{"translate":"incendium.advancement.quartz_flats.torte.kitchen_treasure.title"}] }, "description": { - "translate": "Find the hidden treasure in the Quartz Kitchen" + "translate": "%1$s%4733088$s","with":["Find the hidden treasure in the Quartz Kitchen",{"translate":"incendium.advancement.quartz_flats.torte.kitchen_treasure.desc"}] }, "frame": "goal", "show_toast": true, diff --git a/data/incendium/advancements/quartz_flats/torte/root.json b/data/incendium/advancements/quartz_flats/torte/root.json old mode 100755 new mode 100644 index 01614c4..65a6822 --- a/data/incendium/advancements/quartz_flats/torte/root.json +++ b/data/incendium/advancements/quartz_flats/torte/root.json @@ -4,10 +4,10 @@ "item": "minecraft:bone" }, "title": { - "translate": "You Fool!" + "translate": "%1$s%4733088$s","with":["You Fool!",{"translate":"incendium.advancement.quartz_flats.torte.root.title"}] }, "description": { - "translate": "Kill the skeleton chef Torte and loot his kitchen" + "translate": "%1$s%4733088$s","with":["Kill the skeleton chef Torte and loot his kitchen",{"translate":"incendium.advancement.quartz_flats.torte.root.desc"}] }, "frame": "goal", "show_toast": true, diff --git a/data/incendium/advancements/root.json b/data/incendium/advancements/root.json old mode 100755 new mode 100644 index 0a34645..ad197e5 --- a/data/incendium/advancements/root.json +++ b/data/incendium/advancements/root.json @@ -4,10 +4,10 @@ "item": "crying_obsidian" }, "title": { - "translate": "Incendium" + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium.advancement.root.title"}] }, "description": { - "translate": "Explore the terrifying, and rewarding, Incendium Nether" + "translate": "%1$s%4733088$s","with":["Explore the terrifying, and rewarding, Incendium Nether",{"translate":"incendium.advancement.root.desc"}] }, "background": "minecraft:textures/block/polished_blackstone_bricks.png", "hidden": false, diff --git a/data/incendium/advancements/technical/feed_ghastling.json b/data/incendium/advancements/technical/feed_ghastling.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/firestorm.json b/data/incendium/advancements/technical/firestorm.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/holy_wrath.json b/data/incendium/advancements/technical/holy_wrath.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/inventory/firestorm.json b/data/incendium/advancements/technical/inventory/firestorm.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/inventory/sentrys_wrath.json b/data/incendium/advancements/technical/inventory/sentrys_wrath.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/multiplex_crossbow.json b/data/incendium/advancements/technical/multiplex_crossbow.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/new_player.json b/data/incendium/advancements/technical/new_player.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/on_block.json b/data/incendium/advancements/technical/on_block.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/on_effect_change.json b/data/incendium/advancements/technical/on_effect_change.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/on_hit.json b/data/incendium/advancements/technical/on_hit.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/on_inventory_change.json b/data/incendium/advancements/technical/on_inventory_change.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/on_kill.json b/data/incendium/advancements/technical/on_kill.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/on_player_hurt.json b/data/incendium/advancements/technical/on_player_hurt.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/root.json b/data/incendium/advancements/technical/root.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/scroll_of_returning.json b/data/incendium/advancements/technical/scroll_of_returning.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/sentrys_wrath.json b/data/incendium/advancements/technical/sentrys_wrath.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/using/ragnarok.json b/data/incendium/advancements/technical/using/ragnarok.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/using/shield.json b/data/incendium/advancements/technical/using/shield.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/technical/using/trailblazer.json b/data/incendium/advancements/technical/using/trailblazer.json old mode 100755 new mode 100644 diff --git a/data/incendium/advancements/toxic_heap/mystic_wisdom.json b/data/incendium/advancements/toxic_heap/mystic_wisdom.json old mode 100755 new mode 100644 index 40e5699..6889f6f --- a/data/incendium/advancements/toxic_heap/mystic_wisdom.json +++ b/data/incendium/advancements/toxic_heap/mystic_wisdom.json @@ -2,13 +2,13 @@ "display": { "icon": { "item": "player_head", - "nbt": "{display:{Name:'{\"text\":\"Nuclear Waste\"}'},SkullOwner:{Id:[I;1055107433,-1008842451,-1806847900,-1704824368],Properties:{textures:[{Value:'eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWM2NDU2OGFkZWJmMjg0NGRmODI0MzMyZGMyN2U0YzY2YThhOWFmNmI0ZDc1Mjc4MmY2MTBkYjYxZDA2NSJ9fX0='}]}}}" + "nbt": "{display:{Name:'{\"text\":\"Nuclear Waste\"}'},SkullOwner:'{Id:[I;1055107433,-1008842451,-1806847900,-1704824368],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWM2NDU2OGFkZWJmMjg0NGRmODI0MzMyZGMyN2U0YzY2YThhOWFmNmI0ZDc1Mjc4MmY2MTBkYjYxZDA2NSJ9fX0=\"}]}}'}" }, "title": { - "translate": "Mystic Wisdom" + "translate": "%1$s%4733088$s","with":["Mystic Wisdom",{"translate":"incendium.advancement.toxic_heap.mystic_wisdom.title"}] }, "description": { - "translate": "Discover every type of loot in a Nether Reactor" + "translate": "%1$s%4733088$s","with":["Discover every type of loot in a Nether Reactor",{"translate":"incendium.advancement.toxic_heap.mystic_wisdom.desc"}] }, "frame": "challenge", "show_toast": true, diff --git a/data/incendium/advancements/toxic_heap/nuclear_fusion.json b/data/incendium/advancements/toxic_heap/nuclear_fusion.json old mode 100755 new mode 100644 index 2d6703b..25f3da9 --- a/data/incendium/advancements/toxic_heap/nuclear_fusion.json +++ b/data/incendium/advancements/toxic_heap/nuclear_fusion.json @@ -8,10 +8,10 @@ "nbt": "{Enchantments:[]}" }, "title": { - "translate": "Pocket Edition Alpha" + "translate": "%1$s%4733088$s","with":["Pocket Edition Alpha",{"translate":"incendium.advancement.toxic_heap.nuclear_fusion.title"}] }, "description": { - "translate": "Loot a Nether Reactor" + "translate": "%1$s%4733088$s","with":["Loot a Nether Reactor",{"translate":"incendium.advancement.toxic_heap.nuclear_fusion.desc"}] }, "frame": "goal", "show_toast": true, diff --git a/data/incendium/advancements/toxic_heap/root.json b/data/incendium/advancements/toxic_heap/root.json old mode 100755 new mode 100644 index 5190061..d893b8c --- a/data/incendium/advancements/toxic_heap/root.json +++ b/data/incendium/advancements/toxic_heap/root.json @@ -5,10 +5,10 @@ "nbt": "{Enchantments:[]}" }, "title": { - "translate": "Radioactive" + "translate": "%1$s%4733088$s","with":["Radioactive",{"translate":"incendium.advancement.toxic_heap.root.title"}] }, "description": { - "translate": "Enter the nuclear wastelands of the Toxic Heap" + "translate": "%1$s%4733088$s","with":["Enter the nuclear wastelands of the Toxic Heap",{"translate":"incendium.advancement.toxic_heap.root.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/advancements/toxic_heap/slime_poison.json b/data/incendium/advancements/toxic_heap/slime_poison.json old mode 100755 new mode 100644 index 07dc8d6..14b178f --- a/data/incendium/advancements/toxic_heap/slime_poison.json +++ b/data/incendium/advancements/toxic_heap/slime_poison.json @@ -5,10 +5,10 @@ "nbt": "{Potion:\"minecraft:long_poison\"}" }, "title": { - "translate": "Toxic Personality" + "translate": "%1$s%4733088$s","with":["Toxic Personality",{"translate":"incendium.advancement.toxic_heap.slime_poison.title"}] }, "description": { - "translate": "Get poisoned by a toxic slime" + "translate": "%1$s%4733088$s","with":["Get poisoned by a toxic slime",{"translate":"incendium.advancement.toxic_heap.slime_poison.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/advancements/volcanic_deltas/hidden_debris.json b/data/incendium/advancements/volcanic_deltas/hidden_debris.json old mode 100755 new mode 100644 index 55b67bb..13e77b5 --- a/data/incendium/advancements/volcanic_deltas/hidden_debris.json +++ b/data/incendium/advancements/volcanic_deltas/hidden_debris.json @@ -4,10 +4,10 @@ "item": "ancient_debris" }, "title": { - "translate": "Treacherous Heights" + "translate": "%1$s%4733088$s","with":["Treacherous Heights",{"translate":"incendium.advancement.volcanic_deltas.hidden_debris.title"}] }, "description": { - "translate": "Mine the exposed ancient debris in the height of the Volcanic Deltas" + "translate": "%1$s%4733088$s","with":["Mine the exposed ancient debris in the height of the Volcanic Deltas",{"translate":"incendium.advancement.volcanic_deltas.hidden_debris.desc"}] }, "frame": "challenge", "show_toast": true, diff --git a/data/incendium/advancements/volcanic_deltas/root.json b/data/incendium/advancements/volcanic_deltas/root.json old mode 100755 new mode 100644 index 218f2fc..e2c5f78 --- a/data/incendium/advancements/volcanic_deltas/root.json +++ b/data/incendium/advancements/volcanic_deltas/root.json @@ -4,10 +4,10 @@ "item": "polished_basalt" }, "title": { - "translate": "Hellfire Mantle" + "translate": "%1$s%4733088$s","with":["Hellfire Mantle",{"translate":"incendium.advancement.volcanic_deltas.root.title"}] }, "description": { - "translate": "Enter the chaotic Volcanic Deltas" + "translate": "%1$s%4733088$s","with":["Enter the chaotic Volcanic Deltas",{"translate":"incendium.advancement.volcanic_deltas.root.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/advancements/withered_forest/chain_armor.json b/data/incendium/advancements/withered_forest/chain_armor.json old mode 100755 new mode 100644 index 2408045..098c7e4 --- a/data/incendium/advancements/withered_forest/chain_armor.json +++ b/data/incendium/advancements/withered_forest/chain_armor.json @@ -5,10 +5,10 @@ "nbt": "{Enchantments:[]}" }, "title": { - "translate": "Ghostbuster" + "translate": "%1$s%4733088$s","with":["Ghostbuster",{"translate":"incendium.advancement.withered_forest.chain_armor.title"}] }, "description": { - "translate": "Put on some chain armor and use it to dispel a restless spirit" + "translate": "%1$s%4733088$s","with":["Put on some chain armor and use it to dispel a restless spirit",{"translate":"incendium.advancement.withered_forest.chain_armor.desc"}] }, "frame": "challenge", "show_toast": true, diff --git a/data/incendium/advancements/withered_forest/kill_spirit.json b/data/incendium/advancements/withered_forest/kill_spirit.json old mode 100755 new mode 100644 index a715089..1b26e1a --- a/data/incendium/advancements/withered_forest/kill_spirit.json +++ b/data/incendium/advancements/withered_forest/kill_spirit.json @@ -4,10 +4,10 @@ "item": "experience_bottle" }, "title": { - "translate": "Apparitions" + "translate": "%1$s%4733088$s","with":["Apparitions",{"translate":"incendium.advancement.withered_forest.kill_spirit.title"}] }, "description": { - "translate": "Kill a restless spirit" + "translate": "%1$s%4733088$s","with":["Kill a restless spirit",{"translate":"incendium.advancement.withered_forest.kill_spirit.desc"}] }, "frame": "goal", "show_toast": true, diff --git a/data/incendium/advancements/withered_forest/root.json b/data/incendium/advancements/withered_forest/root.json old mode 100755 new mode 100644 index fe1af7e..6ca9c24 --- a/data/incendium/advancements/withered_forest/root.json +++ b/data/incendium/advancements/withered_forest/root.json @@ -4,10 +4,10 @@ "item": "blackstone" }, "title": { - "translate": "Ancient Battlefield" + "translate": "%1$s%4733088$s","with":["Ancient Battlefield",{"translate":"incendium.advancement.withered_forest.root.title"}] }, "description": { - "translate": "Enter the Withered Forest, ancestral battleground of the Piglins and Wither Skeletons" + "translate": "%1$s%4733088$s","with":["Enter the Withered Forest, ancestral battleground of the Piglins and Wither Skeletons",{"translate":"incendium.advancement.withered_forest.root.desc"}] }, "frame": "task", "show_toast": true, diff --git a/data/incendium/biome_colors.json b/data/incendium/biome_colors.json new file mode 100644 index 0000000..8fdb100 --- /dev/null +++ b/data/incendium/biome_colors.json @@ -0,0 +1,42 @@ +{ + "incendium:ash_barrens": { + "r": 100, + "g": 0, + "b": 0 + }, + "incendium:infernal_dunes": { + "r": 252, + "g": 188, + "b": 50 + }, + "incendium:inverted_forest": { + "r": 86, + "g": 179, + "b": 156 + }, + "incendium:quartz_flats": { + "r": 233, + "g": 233, + "b": 255 + }, + "incendium:toxic_heap": { + "r": 140, + "g": 202, + "b": 81 + }, + "incendium:volcanic_deltas": { + "r": 192, + "g": 79, + "b": 0 + }, + "incendium:weeping_valley": { + "r": 145, + "g": 84, + "b": 72 + }, + "incendium:withered_forest": { + "r": 110, + "g": 110, + "b": 110 + } +} \ No newline at end of file diff --git a/data/incendium/functions/_admin_menu.mcfunction b/data/incendium/functions/_admin_menu.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/gen.py b/data/incendium/functions/admin/gen.py old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/all.mcfunction b/data/incendium/functions/admin/give/all.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/blazing_hatchet.mcfunction b/data/incendium/functions/admin/give/blazing_hatchet.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/chilling_blade.mcfunction b/data/incendium/functions/admin/give/chilling_blade.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/daybreaker.mcfunction b/data/incendium/functions/admin/give/daybreaker.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/firestorm.mcfunction b/data/incendium/functions/admin/give/firestorm.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/greatsword_of_sacrifice.mcfunction b/data/incendium/functions/admin/give/greatsword_of_sacrifice.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/hazmat_suit.mcfunction b/data/incendium/functions/admin/give/hazmat_suit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/hefty_pickaxe.mcfunction b/data/incendium/functions/admin/give/hefty_pickaxe.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/holy_wrath.mcfunction b/data/incendium/functions/admin/give/holy_wrath.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/infernal_feather.mcfunction b/data/incendium/functions/admin/give/infernal_feather.mcfunction new file mode 100644 index 0000000..99da454 --- /dev/null +++ b/data/incendium/functions/admin/give/infernal_feather.mcfunction @@ -0,0 +1 @@ +loot give @s loot incendium:artifact/tool/infernal_feather \ No newline at end of file diff --git a/data/incendium/functions/admin/give/infernal_wings.mcfunction b/data/incendium/functions/admin/give/infernal_wings.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/inferno_kit/1.mcfunction b/data/incendium/functions/admin/give/inferno_kit/1.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/inferno_kit/2.mcfunction b/data/incendium/functions/admin/give/inferno_kit/2.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/inferno_kit/3.mcfunction b/data/incendium/functions/admin/give/inferno_kit/3.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/multiplex_crossbow.mcfunction b/data/incendium/functions/admin/give/multiplex_crossbow.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/necrotic_shield.mcfunction b/data/incendium/functions/admin/give/necrotic_shield.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/prismatic_shield.mcfunction b/data/incendium/functions/admin/give/prismatic_shield.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/radiation_shield.mcfunction b/data/incendium/functions/admin/give/radiation_shield.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/ragnarok.mcfunction b/data/incendium/functions/admin/give/ragnarok.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/scarlet_dagger.mcfunction b/data/incendium/functions/admin/give/scarlet_dagger.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/scouts_battle_helm.mcfunction b/data/incendium/functions/admin/give/scouts_battle_helm.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/sentrys_wrath.mcfunction b/data/incendium/functions/admin/give/sentrys_wrath.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/torch_of_lunacy.mcfunction b/data/incendium/functions/admin/give/torch_of_lunacy.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/trailblazer.mcfunction b/data/incendium/functions/admin/give/trailblazer.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/unstable_powder.mcfunction b/data/incendium/functions/admin/give/unstable_powder.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/voltaic_trident.mcfunction b/data/incendium/functions/admin/give/voltaic_trident.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/warping_witherblade.mcfunction b/data/incendium/functions/admin/give/warping_witherblade.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/give/withersbane.mcfunction b/data/incendium/functions/admin/give/withersbane.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu.allay b/data/incendium/functions/admin/menu.allay old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu.mcfunction b/data/incendium/functions/admin/menu.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/give/1.allay b/data/incendium/functions/admin/menu/give/1.allay old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/give/1.mcfunction b/data/incendium/functions/admin/menu/give/1.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/give/2.allay b/data/incendium/functions/admin/menu/give/2.allay old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/give/2.mcfunction b/data/incendium/functions/admin/menu/give/2.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/give/3.allay b/data/incendium/functions/admin/menu/give/3.allay old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/give/3.mcfunction b/data/incendium/functions/admin/menu/give/3.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/give/4.allay b/data/incendium/functions/admin/menu/give/4.allay old mode 100755 new mode 100644 index a1c0d4d..ef33b46 --- a/data/incendium/functions/admin/menu/give/4.allay +++ b/data/incendium/functions/admin/menu/give/4.allay @@ -2,9 +2,9 @@ [\[ Incendium Menu: Give (4/5) \]](bold, #FF3F0D) [→](bold, gold) [Warping Witherblade](#E85302, run="/function incendium:admin/give/warping_witherblade") [→](bold, gold) [Withersbane](#FF870F, run="/function incendium:admin/give/withersbane") -[→](bold, gold) [Infernal Wings](#E85302, run="/function incendium:admin/give/infernal_wings") -[→](bold, gold) [Inferno Kit 1](#FF870F, run="/function incendium:admin/give/inferno_kit/1") -[→](bold, gold) [Inferno Kit 2](#E85302, run="/function incendium:admin/give/inferno_kit/2") -[→](bold, gold) [Inferno Kit 3](#FF870F, run="/function incendium:admin/give/inferno_kit/3") -[→](bold, gold) [Scroll of Returning](#E85302, run="/function incendium:admin/give/scroll_of_returning") +[→](bold, gold) [Infernal Feather](#E85302, run="/function incendium:admin/give/infernal_feather") +[→](bold, gold) [Infernal Wings](#FF870F, run="/function incendium:admin/give/infernal_wings") +[→](bold, gold) [Inferno Kit 1](#E85302, run="/function incendium:admin/give/inferno_kit/1") +[→](bold, gold) [Inferno Kit 2](#FF870F, run="/function incendium:admin/give/inferno_kit/2") +[→](bold, gold) [Inferno Kit 3](#E85302, run="/function incendium:admin/give/inferno_kit/3") [← Back](bold, #FF3F0D, run="/function incendium:admin/menu/give/3") [|](bold, gray) [Next →](bold, #FF3F0D, run="/function incendium:admin/menu/give/5") \ No newline at end of file diff --git a/data/incendium/functions/admin/menu/give/4.mcfunction b/data/incendium/functions/admin/menu/give/4.mcfunction old mode 100755 new mode 100644 index 91f7d5f..4e86f7c --- a/data/incendium/functions/admin/menu/give/4.mcfunction +++ b/data/incendium/functions/admin/menu/give/4.mcfunction @@ -1 +1 @@ -tellraw @s ["", {"text": "[ Incendium Menu: Give (4/5) ]", "bold": true, "color": "#FF3F0D"}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Warping Witherblade", "color": "#E85302", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/warping_witherblade"}}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Withersbane", "color": "#FF870F", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/withersbane"}}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Infernal Wings", "color": "#E85302", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/infernal_wings"}}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Inferno Kit 1", "color": "#FF870F", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/inferno_kit/1"}}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Inferno Kit 2", "color": "#E85302", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/inferno_kit/2"}}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Inferno Kit 3", "color": "#FF870F", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/inferno_kit/3"}}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Scroll of Returning", "color": "#E85302", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/scroll_of_returning"}}, {"text": "\n"}, {"text": "\u2190 Back", "bold": true, "color": "#FF3F0D", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/menu/give/3"}}, {"text": " "}, {"text": "|", "bold": true, "color": "gray"}, {"text": " "}, {"text": "Next \u2192", "bold": true, "color": "#FF3F0D", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/menu/give/5"}}] \ No newline at end of file +tellraw @s ["", {"text": "[ Incendium Menu: Give (4/5) ]", "bold": true, "color": "#FF3F0D"}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Warping Witherblade", "color": "#E85302", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/warping_witherblade"}}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Withersbane", "color": "#FF870F", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/withersbane"}}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Infernal Feather", "color": "#E85302", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/infernal_feather"}}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Infernal Wings", "color": "#FF870F", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/infernal_wings"}}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Inferno Kit 1", "color": "#E85302", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/inferno_kit/1"}}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Inferno Kit 2", "color": "#FF870F", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/inferno_kit/2"}}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Inferno Kit 3", "color": "#E85302", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/inferno_kit/3"}}, {"text": "\n"}, {"text": "\u2190 Back", "bold": true, "color": "#FF3F0D", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/menu/give/3"}}, {"text": " "}, {"text": "|", "bold": true, "color": "gray"}, {"text": " "}, {"text": "Next \u2192", "bold": true, "color": "#FF3F0D", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/menu/give/5"}}] \ No newline at end of file diff --git a/data/incendium/functions/admin/menu/give/5.allay b/data/incendium/functions/admin/menu/give/5.allay index 580f866..4184b99 100644 --- a/data/incendium/functions/admin/menu/give/5.allay +++ b/data/incendium/functions/admin/menu/give/5.allay @@ -1,7 +1,7 @@ [\[ Incendium Menu: Give (5/5) \]](bold, #FF3F0D) [→](bold, gold) [Restless Nature](#E85302, run="/function incendium:admin/give/restless_nature") - +[→](bold, gold) [Scroll of Returning](#FF870F, run="/function incendium:admin/give/scroll_of_returning") diff --git a/data/incendium/functions/admin/menu/give/5.mcfunction b/data/incendium/functions/admin/menu/give/5.mcfunction index 6a7e9b7..d696436 100644 --- a/data/incendium/functions/admin/menu/give/5.mcfunction +++ b/data/incendium/functions/admin/menu/give/5.mcfunction @@ -1 +1 @@ -tellraw @s ["", {"text": "[ Incendium Menu: Give (5/5) ]", "bold": true, "color": "#FF3F0D"}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Restless Nature", "color": "#E85302", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/restless_nature"}}, {"text": "\n\n\n\n\n\n\n"}, {"text": "\u2190 Back", "bold": true, "color": "#FF3F0D", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/menu/give/4"}}, {"text": " "}, {"text": "|", "bold": true, "color": "gray"}, {"text": " "}, {"text": "First \u2192", "bold": true, "color": "#FF3F0D", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/menu/give/1"}}] \ No newline at end of file +tellraw @s ["", {"text": "[ Incendium Menu: Give (5/5) ]", "bold": true, "color": "#FF3F0D"}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Restless Nature", "color": "#E85302", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/restless_nature"}}, {"text": "\n"}, {"text": "\u2192", "bold": true, "color": "gold"}, {"text": " "}, {"text": "Scroll of Returning", "color": "#FF870F", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/give/scroll_of_returning"}}, {"text": "\n\n\n\n\n\n"}, {"text": "\u2190 Back", "bold": true, "color": "#FF3F0D", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/menu/give/4"}}, {"text": " "}, {"text": "|", "bold": true, "color": "gray"}, {"text": " "}, {"text": "First \u2192", "bold": true, "color": "#FF3F0D", "clickEvent": {"action": "run_command", "value": "/function incendium:admin/menu/give/1"}}] \ No newline at end of file diff --git a/data/incendium/functions/admin/menu/inferno/main.allay b/data/incendium/functions/admin/menu/inferno/main.allay old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/inferno/main.mcfunction b/data/incendium/functions/admin/menu/inferno/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/inferno/spell/1.allay b/data/incendium/functions/admin/menu/inferno/spell/1.allay old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/inferno/spell/1.mcfunction b/data/incendium/functions/admin/menu/inferno/spell/1.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/inferno/spell/2.allay b/data/incendium/functions/admin/menu/inferno/spell/2.allay old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/inferno/spell/2.mcfunction b/data/incendium/functions/admin/menu/inferno/spell/2.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/inferno/spell/3.allay b/data/incendium/functions/admin/menu/inferno/spell/3.allay old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/inferno/spell/3.mcfunction b/data/incendium/functions/admin/menu/inferno/spell/3.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/inferno/spell/4.allay b/data/incendium/functions/admin/menu/inferno/spell/4.allay old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/inferno/spell/4.mcfunction b/data/incendium/functions/admin/menu/inferno/spell/4.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/inferno/spell/5.allay b/data/incendium/functions/admin/menu/inferno/spell/5.allay old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/inferno/spell/5.mcfunction b/data/incendium/functions/admin/menu/inferno/spell/5.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/inferno/spell/6.allay b/data/incendium/functions/admin/menu/inferno/spell/6.allay old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/inferno/spell/6.mcfunction b/data/incendium/functions/admin/menu/inferno/spell/6.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/inferno/spell/7.allay b/data/incendium/functions/admin/menu/inferno/spell/7.allay old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/inferno/spell/7.mcfunction b/data/incendium/functions/admin/menu/inferno/spell/7.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/spawn/1.allay b/data/incendium/functions/admin/menu/spawn/1.allay old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/spawn/1.mcfunction b/data/incendium/functions/admin/menu/spawn/1.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/spawn/2.allay b/data/incendium/functions/admin/menu/spawn/2.allay old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/menu/spawn/2.mcfunction b/data/incendium/functions/admin/menu/spawn/2.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/random_teleport.mcfunction b/data/incendium/functions/admin/random_teleport.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/set/castle/ai/off.mcfunction b/data/incendium/functions/admin/set/castle/ai/off.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/set/castle/ai/on.mcfunction b/data/incendium/functions/admin/set/castle/ai/on.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/spawn/castle/alchemist.mcfunction b/data/incendium/functions/admin/spawn/castle/alchemist.mcfunction old mode 100755 new mode 100644 index 5d49dd5..a72f9be --- a/data/incendium/functions/admin/spawn/castle/alchemist.mcfunction +++ b/data/incendium/functions/admin/spawn/castle/alchemist.mcfunction @@ -1 +1 @@ -summon minecraft:piglin_brute ~ ~.2 ~ {ArmorItems: [{id: "minecraft:leather_boots", Count: 1b, tag: {Unbreakable: 1b, display: {color: 8416735}, Enchantments: [{lvl: 4s, id: "minecraft:protection"}]}}, {id: "minecraft:leather_leggings", Count: 1b, tag: {Unbreakable: 1b, display: {color: 8416735}, Enchantments: [{lvl: 4s, id: "minecraft:protection"}]}}, {id: "minecraft:leather_chestplate", Count: 1b, tag: {Unbreakable: 1b, display: {color: 8416735}, Enchantments: [{lvl: 4s, id: "minecraft:protection"}]}}, {id: "minecraft:leather_helmet", Count: 1b, tag: {Unbreakable: 1b, display: {color: 8416735}, Enchantments: [{lvl: 4s, id: "minecraft:protection"}]}}], HandItems: [{id: "minecraft:splash_potion", Count: 1b, tag: {Potion: "minecraft:strong_harming", CustomPotionColor: 0}}, {}], Attributes: [{Base: 30.0d, Name: "minecraft:generic.follow_range"}, {Base: 40.0d, Name: "minecraft:generic.max_health"}, {Base: 3.0d, Name: "minecraft:generic.attack_damage"}, {Base: 0.4d, Name: "minecraft:generic.movement_speed"}, {Base: 0.0d, Name: "minecraft:generic.armor"}], Tags: ["in.alchemist", "in.castle"], ArmorDropChances: [0.0f, 0.0f, 0.0f, 0.0f], CustomName: '{"text":"Alchemist"}', Health: 40.0f, PersistenceRequired: 1b, HandDropChances: [0.0f, 0.085f]} +summon minecraft:piglin_brute ~ ~.2 ~ {ArmorItems: [{id: "minecraft:leather_boots", Count: 1b, tag: {Unbreakable: 1b, display: {color: 8416735}, Enchantments: [{lvl: 4s, id: "minecraft:protection"}]}}, {id: "minecraft:leather_leggings", Count: 1b, tag: {Unbreakable: 1b, display: {color: 8416735}, Enchantments: [{lvl: 4s, id: "minecraft:protection"}]}}, {id: "minecraft:leather_chestplate", Count: 1b, tag: {Unbreakable: 1b, display: {color: 8416735}, Enchantments: [{lvl: 4s, id: "minecraft:protection"}]}}, {id: "minecraft:leather_helmet", Count: 1b, tag: {Unbreakable: 1b, display: {color: 8416735}, Enchantments: [{lvl: 4s, id: "minecraft:protection"}]}}], HandItems: [{id: "minecraft:splash_potion", Count: 1b, tag: {Potion: "minecraft:strong_harming", CustomPotionColor: 0}}, {}], Attributes: [{Base: 30.0d, Name: "minecraft:generic.follow_range"}, {Base: 40.0d, Name: "minecraft:generic.max_health"}, {Base: 3.0d, Name: "minecraft:generic.attack_damage"}, {Base: 0.4d, Name: "minecraft:generic.movement_speed"}, {Base: 0.0d, Name: "minecraft:generic.armor"}], Tags: ["in.alchemist", "in.castle"], ArmorDropChances: [0.0f, 0.0f, 0.0f, 0.0f], CustomName: '{"translate": "%1$s%4733088$s","with":["Piglin Alchemist",{"translate":"incendium.mob.castle.alchemist.name"}]}', Health: 40.0f, PersistenceRequired: 1b, HandDropChances: [0.0f, 0.085f]} diff --git a/data/incendium/functions/admin/spawn/castle/all.mcfunction b/data/incendium/functions/admin/spawn/castle/all.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/spawn/castle/archer.mcfunction b/data/incendium/functions/admin/spawn/castle/archer.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/spawn/castle/blacksmith.mcfunction b/data/incendium/functions/admin/spawn/castle/blacksmith.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/spawn/castle/knight/all.mcfunction b/data/incendium/functions/admin/spawn/castle/knight/all.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/spawn/castle/knight/diamond.mcfunction b/data/incendium/functions/admin/spawn/castle/knight/diamond.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/spawn/castle/knight/gold.mcfunction b/data/incendium/functions/admin/spawn/castle/knight/gold.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/spawn/castle/knight/iron.mcfunction b/data/incendium/functions/admin/spawn/castle/knight/iron.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/spawn/castle/knight/netherite.mcfunction b/data/incendium/functions/admin/spawn/castle/knight/netherite.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/spawn/castle/paratrooper.mcfunction b/data/incendium/functions/admin/spawn/castle/paratrooper.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/spawn/castle/pyro.mcfunction b/data/incendium/functions/admin/spawn/castle/pyro.mcfunction old mode 100755 new mode 100644 index c4cbd59..1c8cc4d --- a/data/incendium/functions/admin/spawn/castle/pyro.mcfunction +++ b/data/incendium/functions/admin/spawn/castle/pyro.mcfunction @@ -1 +1 @@ -summon minecraft:piglin_brute ~ ~.2 ~ {ArmorItems: [{id: "minecraft:golden_boots", Count: 1b, tag: {Enchantments: [{lvl: 4s, id: "minecraft:protection"}, {lvl: 100s, id: "minecraft:fire_protection"}]}}, {id: "minecraft:golden_leggings", Count: 1b, tag: {Enchantments: [{lvl: 4s, id: "minecraft:protection"}, {lvl: 100s, id: "minecraft:fire_protection"}]}}, {id: "minecraft:golden_chestplate", Count: 1b, tag: {Enchantments: [{lvl: 4s, id: "minecraft:protection"}, {lvl: 100s, id: "minecraft:fire_protection"}]}}, {id: "minecraft:golden_helmet", Count: 1b, tag: {Enchantments: [{lvl: 4s, id: "minecraft:protection"}, {lvl: 100s, id: "minecraft:fire_protection"}]}}], HandItems: [{id: "minecraft:blaze_rod", Count: 1b, tag: {Enchantments: [{lvl: 5s, id: "minecraft:sharpness"}]}}, {}], Attributes: [{Base: 60.0d, Name: "minecraft:generic.max_health"}, {Base: 0.350d, Name: "minecraft:generic.movement_speed"}], Tags: ["in.pyro", "in.castle"], ArmorDropChances: [0.0f, 0.0f, 0.0f, 0.0f], CustomName: '{"color":"red","text":"Pyromancer"}', Health: 60.0f, PersistenceRequired: 1b} +summon minecraft:piglin_brute ~ ~.2 ~ {ArmorItems: [{id: "minecraft:golden_boots", Count: 1b, tag: {Enchantments: [{lvl: 4s, id: "minecraft:protection"}, {lvl: 100s, id: "minecraft:fire_protection"}]}}, {id: "minecraft:golden_leggings", Count: 1b, tag: {Enchantments: [{lvl: 4s, id: "minecraft:protection"}, {lvl: 100s, id: "minecraft:fire_protection"}]}}, {id: "minecraft:golden_chestplate", Count: 1b, tag: {Enchantments: [{lvl: 4s, id: "minecraft:protection"}, {lvl: 100s, id: "minecraft:fire_protection"}]}}, {id: "minecraft:golden_helmet", Count: 1b, tag: {Enchantments: [{lvl: 4s, id: "minecraft:protection"}, {lvl: 100s, id: "minecraft:fire_protection"}]}}], HandItems: [{id: "minecraft:blaze_rod", Count: 1b, tag: {Enchantments: [{lvl: 5s, id: "minecraft:sharpness"}]}}, {}], Attributes: [{Base: 60.0d, Name: "minecraft:generic.max_health"}, {Base: 0.350d, Name: "minecraft:generic.movement_speed"}], Tags: ["in.pyro", "in.castle"], ArmorDropChances: [0.0f, 0.0f, 0.0f, 0.0f], CustomName: '{"color":"red","translate": "%1$s%4733088$s","with":["Piglin Pyromancer",{"translate":"incendium.mob.castle.pyro.name"}]}', Health: 60.0f, PersistenceRequired: 1b} diff --git a/data/incendium/functions/admin/spawn/castle/scout.mcfunction b/data/incendium/functions/admin/spawn/castle/scout.mcfunction old mode 100755 new mode 100644 index f63b5c8..bbde2c0 --- a/data/incendium/functions/admin/spawn/castle/scout.mcfunction +++ b/data/incendium/functions/admin/spawn/castle/scout.mcfunction @@ -1 +1 @@ -summon minecraft:piglin_brute ~ ~.2 ~ {ArmorItems: [{id: "minecraft:leather_boots", Count: 1b}, {id: "minecraft:leather_leggings", Count: 1b}, {id: "minecraft:leather_chestplate", Count: 1b}, {id: "minecraft:leather_helmet", Count: 1b}], HandItems: [{id: "minecraft:iron_sword", Count: 1b}, {}], Attributes: [{Base: 7.0d, Name: "minecraft:generic.attack_damage"}, {Base: 30.0d, Name: "minecraft:generic.attack_knockback"}, {Base: 0.425d, Name: "minecraft:generic.movement_speed"}], Tags: ["in.scout", "in.castle"], CustomName: '{"text":"Scout"}', Health: 49.0f, PersistenceRequired: 1b} +summon minecraft:piglin_brute ~ ~.2 ~ {ArmorItems: [{id: "minecraft:leather_boots", Count: 1b}, {id: "minecraft:leather_leggings", Count: 1b}, {id: "minecraft:leather_chestplate", Count: 1b}, {id: "minecraft:leather_helmet", Count: 1b}], HandItems: [{id: "minecraft:iron_sword", Count: 1b}, {}], Attributes: [{Base: 7.0d, Name: "minecraft:generic.attack_damage"}, {Base: 30.0d, Name: "minecraft:generic.attack_knockback"}, {Base: 0.425d, Name: "minecraft:generic.movement_speed"}], Tags: ["in.scout", "in.castle"], CustomName: '{"translate": "%1$s%4733088$s","with":["Piglin Scout",{"translate":"incendium.mob.castle.scout.name"}]}', Health: 49.0f, PersistenceRequired: 1b} diff --git a/data/incendium/functions/admin/spawn/hovering_inferno.mcfunction b/data/incendium/functions/admin/spawn/hovering_inferno.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/spawn/hovering_inferno/phase_2.mcfunction b/data/incendium/functions/admin/spawn/hovering_inferno/phase_2.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/admin/spawn/pipeline_sentry.mcfunction b/data/incendium/functions/admin/spawn/pipeline_sentry.mcfunction old mode 100755 new mode 100644 index 568e979..1a7f46a --- a/data/incendium/functions/admin/spawn/pipeline_sentry.mcfunction +++ b/data/incendium/functions/admin/spawn/pipeline_sentry.mcfunction @@ -1 +1 @@ -summon blaze ~ ~ ~ {Tags:["in.sentry"],CustomName:'"Pipeline Sentry"'} +summon blaze ~ ~ ~ {Tags:["in.sentry"],HandItems:[{id:"minecraft:totem_of_undying",Count:6b},{}]} diff --git a/data/incendium/functions/admin/spawn/sanctum/guardian.mcfunction b/data/incendium/functions/admin/spawn/sanctum/guardian.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/load.mcfunction b/data/incendium/functions/border_of_life/load.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/0.mcfunction b/data/incendium/functions/border_of_life/notes/0.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/1.mcfunction b/data/incendium/functions/border_of_life/notes/1.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/10.mcfunction b/data/incendium/functions/border_of_life/notes/10.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/100.mcfunction b/data/incendium/functions/border_of_life/notes/100.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/101.mcfunction b/data/incendium/functions/border_of_life/notes/101.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/102.mcfunction b/data/incendium/functions/border_of_life/notes/102.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/103.mcfunction b/data/incendium/functions/border_of_life/notes/103.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/104.mcfunction b/data/incendium/functions/border_of_life/notes/104.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/105.mcfunction b/data/incendium/functions/border_of_life/notes/105.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/106.mcfunction b/data/incendium/functions/border_of_life/notes/106.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/107.mcfunction b/data/incendium/functions/border_of_life/notes/107.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/108.mcfunction b/data/incendium/functions/border_of_life/notes/108.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/109.mcfunction b/data/incendium/functions/border_of_life/notes/109.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/11.mcfunction b/data/incendium/functions/border_of_life/notes/11.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/110.mcfunction b/data/incendium/functions/border_of_life/notes/110.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/111.mcfunction b/data/incendium/functions/border_of_life/notes/111.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/112.mcfunction b/data/incendium/functions/border_of_life/notes/112.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/113.mcfunction b/data/incendium/functions/border_of_life/notes/113.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/114.mcfunction b/data/incendium/functions/border_of_life/notes/114.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/115.mcfunction b/data/incendium/functions/border_of_life/notes/115.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/116.mcfunction b/data/incendium/functions/border_of_life/notes/116.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/117.mcfunction b/data/incendium/functions/border_of_life/notes/117.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/118.mcfunction b/data/incendium/functions/border_of_life/notes/118.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/119.mcfunction b/data/incendium/functions/border_of_life/notes/119.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/12.mcfunction b/data/incendium/functions/border_of_life/notes/12.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/120.mcfunction b/data/incendium/functions/border_of_life/notes/120.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/121.mcfunction b/data/incendium/functions/border_of_life/notes/121.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/122.mcfunction b/data/incendium/functions/border_of_life/notes/122.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/123.mcfunction b/data/incendium/functions/border_of_life/notes/123.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/124.mcfunction b/data/incendium/functions/border_of_life/notes/124.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/125.mcfunction b/data/incendium/functions/border_of_life/notes/125.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/126.mcfunction b/data/incendium/functions/border_of_life/notes/126.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/127.mcfunction b/data/incendium/functions/border_of_life/notes/127.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/128.mcfunction b/data/incendium/functions/border_of_life/notes/128.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/13.mcfunction b/data/incendium/functions/border_of_life/notes/13.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/130.mcfunction b/data/incendium/functions/border_of_life/notes/130.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/132.mcfunction b/data/incendium/functions/border_of_life/notes/132.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/134.mcfunction b/data/incendium/functions/border_of_life/notes/134.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/136.mcfunction b/data/incendium/functions/border_of_life/notes/136.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/138.mcfunction b/data/incendium/functions/border_of_life/notes/138.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/14.mcfunction b/data/incendium/functions/border_of_life/notes/14.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/140.mcfunction b/data/incendium/functions/border_of_life/notes/140.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/142.mcfunction b/data/incendium/functions/border_of_life/notes/142.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/144.mcfunction b/data/incendium/functions/border_of_life/notes/144.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/146.mcfunction b/data/incendium/functions/border_of_life/notes/146.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/148.mcfunction b/data/incendium/functions/border_of_life/notes/148.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/15.mcfunction b/data/incendium/functions/border_of_life/notes/15.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/150.mcfunction b/data/incendium/functions/border_of_life/notes/150.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/152.mcfunction b/data/incendium/functions/border_of_life/notes/152.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/154.mcfunction b/data/incendium/functions/border_of_life/notes/154.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/156.mcfunction b/data/incendium/functions/border_of_life/notes/156.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/158.mcfunction b/data/incendium/functions/border_of_life/notes/158.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/159.mcfunction b/data/incendium/functions/border_of_life/notes/159.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/16.mcfunction b/data/incendium/functions/border_of_life/notes/16.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/160.mcfunction b/data/incendium/functions/border_of_life/notes/160.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/162.mcfunction b/data/incendium/functions/border_of_life/notes/162.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/164.mcfunction b/data/incendium/functions/border_of_life/notes/164.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/166.mcfunction b/data/incendium/functions/border_of_life/notes/166.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/167.mcfunction b/data/incendium/functions/border_of_life/notes/167.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/168.mcfunction b/data/incendium/functions/border_of_life/notes/168.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/17.mcfunction b/data/incendium/functions/border_of_life/notes/17.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/170.mcfunction b/data/incendium/functions/border_of_life/notes/170.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/172.mcfunction b/data/incendium/functions/border_of_life/notes/172.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/174.mcfunction b/data/incendium/functions/border_of_life/notes/174.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/175.mcfunction b/data/incendium/functions/border_of_life/notes/175.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/176.mcfunction b/data/incendium/functions/border_of_life/notes/176.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/178.mcfunction b/data/incendium/functions/border_of_life/notes/178.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/18.mcfunction b/data/incendium/functions/border_of_life/notes/18.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/180.mcfunction b/data/incendium/functions/border_of_life/notes/180.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/182.mcfunction b/data/incendium/functions/border_of_life/notes/182.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/183.mcfunction b/data/incendium/functions/border_of_life/notes/183.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/184.mcfunction b/data/incendium/functions/border_of_life/notes/184.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/185.mcfunction b/data/incendium/functions/border_of_life/notes/185.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/186.mcfunction b/data/incendium/functions/border_of_life/notes/186.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/187.mcfunction b/data/incendium/functions/border_of_life/notes/187.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/188.mcfunction b/data/incendium/functions/border_of_life/notes/188.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/189.mcfunction b/data/incendium/functions/border_of_life/notes/189.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/19.mcfunction b/data/incendium/functions/border_of_life/notes/19.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/190.mcfunction b/data/incendium/functions/border_of_life/notes/190.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/191.mcfunction b/data/incendium/functions/border_of_life/notes/191.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/192.mcfunction b/data/incendium/functions/border_of_life/notes/192.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/194.mcfunction b/data/incendium/functions/border_of_life/notes/194.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/196.mcfunction b/data/incendium/functions/border_of_life/notes/196.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/198.mcfunction b/data/incendium/functions/border_of_life/notes/198.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/2.mcfunction b/data/incendium/functions/border_of_life/notes/2.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/20.mcfunction b/data/incendium/functions/border_of_life/notes/20.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/200.mcfunction b/data/incendium/functions/border_of_life/notes/200.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/202.mcfunction b/data/incendium/functions/border_of_life/notes/202.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/204.mcfunction b/data/incendium/functions/border_of_life/notes/204.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/206.mcfunction b/data/incendium/functions/border_of_life/notes/206.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/207.mcfunction b/data/incendium/functions/border_of_life/notes/207.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/208.mcfunction b/data/incendium/functions/border_of_life/notes/208.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/21.mcfunction b/data/incendium/functions/border_of_life/notes/21.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/210.mcfunction b/data/incendium/functions/border_of_life/notes/210.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/212.mcfunction b/data/incendium/functions/border_of_life/notes/212.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/214.mcfunction b/data/incendium/functions/border_of_life/notes/214.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/216.mcfunction b/data/incendium/functions/border_of_life/notes/216.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/218.mcfunction b/data/incendium/functions/border_of_life/notes/218.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/22.mcfunction b/data/incendium/functions/border_of_life/notes/22.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/220.mcfunction b/data/incendium/functions/border_of_life/notes/220.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/222.mcfunction b/data/incendium/functions/border_of_life/notes/222.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/223.mcfunction b/data/incendium/functions/border_of_life/notes/223.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/224.mcfunction b/data/incendium/functions/border_of_life/notes/224.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/226.mcfunction b/data/incendium/functions/border_of_life/notes/226.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/227.mcfunction b/data/incendium/functions/border_of_life/notes/227.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/228.mcfunction b/data/incendium/functions/border_of_life/notes/228.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/23.mcfunction b/data/incendium/functions/border_of_life/notes/23.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/230.mcfunction b/data/incendium/functions/border_of_life/notes/230.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/231.mcfunction b/data/incendium/functions/border_of_life/notes/231.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/232.mcfunction b/data/incendium/functions/border_of_life/notes/232.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/234.mcfunction b/data/incendium/functions/border_of_life/notes/234.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/235.mcfunction b/data/incendium/functions/border_of_life/notes/235.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/236.mcfunction b/data/incendium/functions/border_of_life/notes/236.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/238.mcfunction b/data/incendium/functions/border_of_life/notes/238.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/239.mcfunction b/data/incendium/functions/border_of_life/notes/239.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/24.mcfunction b/data/incendium/functions/border_of_life/notes/24.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/240.mcfunction b/data/incendium/functions/border_of_life/notes/240.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/242.mcfunction b/data/incendium/functions/border_of_life/notes/242.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/244.mcfunction b/data/incendium/functions/border_of_life/notes/244.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/246.mcfunction b/data/incendium/functions/border_of_life/notes/246.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/247.mcfunction b/data/incendium/functions/border_of_life/notes/247.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/248.mcfunction b/data/incendium/functions/border_of_life/notes/248.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/249.mcfunction b/data/incendium/functions/border_of_life/notes/249.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/25.mcfunction b/data/incendium/functions/border_of_life/notes/25.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/250.mcfunction b/data/incendium/functions/border_of_life/notes/250.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/251.mcfunction b/data/incendium/functions/border_of_life/notes/251.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/252.mcfunction b/data/incendium/functions/border_of_life/notes/252.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/253.mcfunction b/data/incendium/functions/border_of_life/notes/253.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/254.mcfunction b/data/incendium/functions/border_of_life/notes/254.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/255.mcfunction b/data/incendium/functions/border_of_life/notes/255.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/256.mcfunction b/data/incendium/functions/border_of_life/notes/256.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/257.mcfunction b/data/incendium/functions/border_of_life/notes/257.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/258.mcfunction b/data/incendium/functions/border_of_life/notes/258.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/259.mcfunction b/data/incendium/functions/border_of_life/notes/259.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/26.mcfunction b/data/incendium/functions/border_of_life/notes/26.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/260.mcfunction b/data/incendium/functions/border_of_life/notes/260.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/261.mcfunction b/data/incendium/functions/border_of_life/notes/261.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/262.mcfunction b/data/incendium/functions/border_of_life/notes/262.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/263.mcfunction b/data/incendium/functions/border_of_life/notes/263.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/264.mcfunction b/data/incendium/functions/border_of_life/notes/264.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/265.mcfunction b/data/incendium/functions/border_of_life/notes/265.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/266.mcfunction b/data/incendium/functions/border_of_life/notes/266.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/267.mcfunction b/data/incendium/functions/border_of_life/notes/267.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/268.mcfunction b/data/incendium/functions/border_of_life/notes/268.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/269.mcfunction b/data/incendium/functions/border_of_life/notes/269.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/27.mcfunction b/data/incendium/functions/border_of_life/notes/27.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/270.mcfunction b/data/incendium/functions/border_of_life/notes/270.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/271.mcfunction b/data/incendium/functions/border_of_life/notes/271.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/272.mcfunction b/data/incendium/functions/border_of_life/notes/272.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/273.mcfunction b/data/incendium/functions/border_of_life/notes/273.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/274.mcfunction b/data/incendium/functions/border_of_life/notes/274.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/275.mcfunction b/data/incendium/functions/border_of_life/notes/275.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/276.mcfunction b/data/incendium/functions/border_of_life/notes/276.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/277.mcfunction b/data/incendium/functions/border_of_life/notes/277.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/278.mcfunction b/data/incendium/functions/border_of_life/notes/278.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/279.mcfunction b/data/incendium/functions/border_of_life/notes/279.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/28.mcfunction b/data/incendium/functions/border_of_life/notes/28.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/280.mcfunction b/data/incendium/functions/border_of_life/notes/280.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/281.mcfunction b/data/incendium/functions/border_of_life/notes/281.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/282.mcfunction b/data/incendium/functions/border_of_life/notes/282.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/283.mcfunction b/data/incendium/functions/border_of_life/notes/283.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/284.mcfunction b/data/incendium/functions/border_of_life/notes/284.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/285.mcfunction b/data/incendium/functions/border_of_life/notes/285.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/286.mcfunction b/data/incendium/functions/border_of_life/notes/286.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/287.mcfunction b/data/incendium/functions/border_of_life/notes/287.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/288.mcfunction b/data/incendium/functions/border_of_life/notes/288.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/289.mcfunction b/data/incendium/functions/border_of_life/notes/289.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/29.mcfunction b/data/incendium/functions/border_of_life/notes/29.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/290.mcfunction b/data/incendium/functions/border_of_life/notes/290.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/291.mcfunction b/data/incendium/functions/border_of_life/notes/291.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/292.mcfunction b/data/incendium/functions/border_of_life/notes/292.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/293.mcfunction b/data/incendium/functions/border_of_life/notes/293.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/294.mcfunction b/data/incendium/functions/border_of_life/notes/294.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/295.mcfunction b/data/incendium/functions/border_of_life/notes/295.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/296.mcfunction b/data/incendium/functions/border_of_life/notes/296.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/297.mcfunction b/data/incendium/functions/border_of_life/notes/297.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/298.mcfunction b/data/incendium/functions/border_of_life/notes/298.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/299.mcfunction b/data/incendium/functions/border_of_life/notes/299.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/3.mcfunction b/data/incendium/functions/border_of_life/notes/3.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/30.mcfunction b/data/incendium/functions/border_of_life/notes/30.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/300.mcfunction b/data/incendium/functions/border_of_life/notes/300.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/301.mcfunction b/data/incendium/functions/border_of_life/notes/301.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/302.mcfunction b/data/incendium/functions/border_of_life/notes/302.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/303.mcfunction b/data/incendium/functions/border_of_life/notes/303.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/304.mcfunction b/data/incendium/functions/border_of_life/notes/304.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/305.mcfunction b/data/incendium/functions/border_of_life/notes/305.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/306.mcfunction b/data/incendium/functions/border_of_life/notes/306.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/307.mcfunction b/data/incendium/functions/border_of_life/notes/307.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/308.mcfunction b/data/incendium/functions/border_of_life/notes/308.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/309.mcfunction b/data/incendium/functions/border_of_life/notes/309.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/31.mcfunction b/data/incendium/functions/border_of_life/notes/31.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/310.mcfunction b/data/incendium/functions/border_of_life/notes/310.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/311.mcfunction b/data/incendium/functions/border_of_life/notes/311.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/312.mcfunction b/data/incendium/functions/border_of_life/notes/312.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/313.mcfunction b/data/incendium/functions/border_of_life/notes/313.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/314.mcfunction b/data/incendium/functions/border_of_life/notes/314.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/315.mcfunction b/data/incendium/functions/border_of_life/notes/315.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/316.mcfunction b/data/incendium/functions/border_of_life/notes/316.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/317.mcfunction b/data/incendium/functions/border_of_life/notes/317.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/318.mcfunction b/data/incendium/functions/border_of_life/notes/318.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/319.mcfunction b/data/incendium/functions/border_of_life/notes/319.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/32.mcfunction b/data/incendium/functions/border_of_life/notes/32.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/320.mcfunction b/data/incendium/functions/border_of_life/notes/320.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/321.mcfunction b/data/incendium/functions/border_of_life/notes/321.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/322.mcfunction b/data/incendium/functions/border_of_life/notes/322.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/323.mcfunction b/data/incendium/functions/border_of_life/notes/323.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/324.mcfunction b/data/incendium/functions/border_of_life/notes/324.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/325.mcfunction b/data/incendium/functions/border_of_life/notes/325.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/326.mcfunction b/data/incendium/functions/border_of_life/notes/326.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/327.mcfunction b/data/incendium/functions/border_of_life/notes/327.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/328.mcfunction b/data/incendium/functions/border_of_life/notes/328.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/329.mcfunction b/data/incendium/functions/border_of_life/notes/329.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/33.mcfunction b/data/incendium/functions/border_of_life/notes/33.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/330.mcfunction b/data/incendium/functions/border_of_life/notes/330.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/331.mcfunction b/data/incendium/functions/border_of_life/notes/331.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/332.mcfunction b/data/incendium/functions/border_of_life/notes/332.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/333.mcfunction b/data/incendium/functions/border_of_life/notes/333.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/334.mcfunction b/data/incendium/functions/border_of_life/notes/334.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/335.mcfunction b/data/incendium/functions/border_of_life/notes/335.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/336.mcfunction b/data/incendium/functions/border_of_life/notes/336.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/337.mcfunction b/data/incendium/functions/border_of_life/notes/337.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/338.mcfunction b/data/incendium/functions/border_of_life/notes/338.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/339.mcfunction b/data/incendium/functions/border_of_life/notes/339.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/34.mcfunction b/data/incendium/functions/border_of_life/notes/34.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/340.mcfunction b/data/incendium/functions/border_of_life/notes/340.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/341.mcfunction b/data/incendium/functions/border_of_life/notes/341.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/342.mcfunction b/data/incendium/functions/border_of_life/notes/342.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/343.mcfunction b/data/incendium/functions/border_of_life/notes/343.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/344.mcfunction b/data/incendium/functions/border_of_life/notes/344.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/345.mcfunction b/data/incendium/functions/border_of_life/notes/345.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/346.mcfunction b/data/incendium/functions/border_of_life/notes/346.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/347.mcfunction b/data/incendium/functions/border_of_life/notes/347.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/348.mcfunction b/data/incendium/functions/border_of_life/notes/348.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/349.mcfunction b/data/incendium/functions/border_of_life/notes/349.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/35.mcfunction b/data/incendium/functions/border_of_life/notes/35.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/350.mcfunction b/data/incendium/functions/border_of_life/notes/350.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/351.mcfunction b/data/incendium/functions/border_of_life/notes/351.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/352.mcfunction b/data/incendium/functions/border_of_life/notes/352.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/353.mcfunction b/data/incendium/functions/border_of_life/notes/353.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/354.mcfunction b/data/incendium/functions/border_of_life/notes/354.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/355.mcfunction b/data/incendium/functions/border_of_life/notes/355.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/356.mcfunction b/data/incendium/functions/border_of_life/notes/356.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/357.mcfunction b/data/incendium/functions/border_of_life/notes/357.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/358.mcfunction b/data/incendium/functions/border_of_life/notes/358.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/359.mcfunction b/data/incendium/functions/border_of_life/notes/359.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/36.mcfunction b/data/incendium/functions/border_of_life/notes/36.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/360.mcfunction b/data/incendium/functions/border_of_life/notes/360.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/361.mcfunction b/data/incendium/functions/border_of_life/notes/361.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/362.mcfunction b/data/incendium/functions/border_of_life/notes/362.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/363.mcfunction b/data/incendium/functions/border_of_life/notes/363.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/364.mcfunction b/data/incendium/functions/border_of_life/notes/364.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/365.mcfunction b/data/incendium/functions/border_of_life/notes/365.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/366.mcfunction b/data/incendium/functions/border_of_life/notes/366.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/367.mcfunction b/data/incendium/functions/border_of_life/notes/367.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/368.mcfunction b/data/incendium/functions/border_of_life/notes/368.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/369.mcfunction b/data/incendium/functions/border_of_life/notes/369.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/37.mcfunction b/data/incendium/functions/border_of_life/notes/37.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/370.mcfunction b/data/incendium/functions/border_of_life/notes/370.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/371.mcfunction b/data/incendium/functions/border_of_life/notes/371.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/372.mcfunction b/data/incendium/functions/border_of_life/notes/372.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/373.mcfunction b/data/incendium/functions/border_of_life/notes/373.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/374.mcfunction b/data/incendium/functions/border_of_life/notes/374.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/375.mcfunction b/data/incendium/functions/border_of_life/notes/375.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/376.mcfunction b/data/incendium/functions/border_of_life/notes/376.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/377.mcfunction b/data/incendium/functions/border_of_life/notes/377.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/378.mcfunction b/data/incendium/functions/border_of_life/notes/378.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/379.mcfunction b/data/incendium/functions/border_of_life/notes/379.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/38.mcfunction b/data/incendium/functions/border_of_life/notes/38.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/380.mcfunction b/data/incendium/functions/border_of_life/notes/380.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/381.mcfunction b/data/incendium/functions/border_of_life/notes/381.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/382.mcfunction b/data/incendium/functions/border_of_life/notes/382.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/383.mcfunction b/data/incendium/functions/border_of_life/notes/383.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/384.mcfunction b/data/incendium/functions/border_of_life/notes/384.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/385.mcfunction b/data/incendium/functions/border_of_life/notes/385.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/386.mcfunction b/data/incendium/functions/border_of_life/notes/386.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/387.mcfunction b/data/incendium/functions/border_of_life/notes/387.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/388.mcfunction b/data/incendium/functions/border_of_life/notes/388.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/389.mcfunction b/data/incendium/functions/border_of_life/notes/389.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/39.mcfunction b/data/incendium/functions/border_of_life/notes/39.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/390.mcfunction b/data/incendium/functions/border_of_life/notes/390.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/391.mcfunction b/data/incendium/functions/border_of_life/notes/391.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/392.mcfunction b/data/incendium/functions/border_of_life/notes/392.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/393.mcfunction b/data/incendium/functions/border_of_life/notes/393.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/394.mcfunction b/data/incendium/functions/border_of_life/notes/394.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/395.mcfunction b/data/incendium/functions/border_of_life/notes/395.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/396.mcfunction b/data/incendium/functions/border_of_life/notes/396.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/397.mcfunction b/data/incendium/functions/border_of_life/notes/397.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/398.mcfunction b/data/incendium/functions/border_of_life/notes/398.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/399.mcfunction b/data/incendium/functions/border_of_life/notes/399.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/4.mcfunction b/data/incendium/functions/border_of_life/notes/4.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/40.mcfunction b/data/incendium/functions/border_of_life/notes/40.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/400.mcfunction b/data/incendium/functions/border_of_life/notes/400.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/401.mcfunction b/data/incendium/functions/border_of_life/notes/401.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/402.mcfunction b/data/incendium/functions/border_of_life/notes/402.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/403.mcfunction b/data/incendium/functions/border_of_life/notes/403.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/404.mcfunction b/data/incendium/functions/border_of_life/notes/404.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/405.mcfunction b/data/incendium/functions/border_of_life/notes/405.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/406.mcfunction b/data/incendium/functions/border_of_life/notes/406.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/407.mcfunction b/data/incendium/functions/border_of_life/notes/407.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/408.mcfunction b/data/incendium/functions/border_of_life/notes/408.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/409.mcfunction b/data/incendium/functions/border_of_life/notes/409.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/41.mcfunction b/data/incendium/functions/border_of_life/notes/41.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/410.mcfunction b/data/incendium/functions/border_of_life/notes/410.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/411.mcfunction b/data/incendium/functions/border_of_life/notes/411.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/412.mcfunction b/data/incendium/functions/border_of_life/notes/412.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/413.mcfunction b/data/incendium/functions/border_of_life/notes/413.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/414.mcfunction b/data/incendium/functions/border_of_life/notes/414.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/415.mcfunction b/data/incendium/functions/border_of_life/notes/415.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/416.mcfunction b/data/incendium/functions/border_of_life/notes/416.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/417.mcfunction b/data/incendium/functions/border_of_life/notes/417.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/418.mcfunction b/data/incendium/functions/border_of_life/notes/418.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/419.mcfunction b/data/incendium/functions/border_of_life/notes/419.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/42.mcfunction b/data/incendium/functions/border_of_life/notes/42.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/420.mcfunction b/data/incendium/functions/border_of_life/notes/420.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/421.mcfunction b/data/incendium/functions/border_of_life/notes/421.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/422.mcfunction b/data/incendium/functions/border_of_life/notes/422.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/423.mcfunction b/data/incendium/functions/border_of_life/notes/423.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/424.mcfunction b/data/incendium/functions/border_of_life/notes/424.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/425.mcfunction b/data/incendium/functions/border_of_life/notes/425.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/426.mcfunction b/data/incendium/functions/border_of_life/notes/426.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/427.mcfunction b/data/incendium/functions/border_of_life/notes/427.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/428.mcfunction b/data/incendium/functions/border_of_life/notes/428.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/429.mcfunction b/data/incendium/functions/border_of_life/notes/429.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/43.mcfunction b/data/incendium/functions/border_of_life/notes/43.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/430.mcfunction b/data/incendium/functions/border_of_life/notes/430.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/431.mcfunction b/data/incendium/functions/border_of_life/notes/431.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/432.mcfunction b/data/incendium/functions/border_of_life/notes/432.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/433.mcfunction b/data/incendium/functions/border_of_life/notes/433.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/434.mcfunction b/data/incendium/functions/border_of_life/notes/434.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/435.mcfunction b/data/incendium/functions/border_of_life/notes/435.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/436.mcfunction b/data/incendium/functions/border_of_life/notes/436.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/437.mcfunction b/data/incendium/functions/border_of_life/notes/437.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/438.mcfunction b/data/incendium/functions/border_of_life/notes/438.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/439.mcfunction b/data/incendium/functions/border_of_life/notes/439.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/44.mcfunction b/data/incendium/functions/border_of_life/notes/44.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/440.mcfunction b/data/incendium/functions/border_of_life/notes/440.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/441.mcfunction b/data/incendium/functions/border_of_life/notes/441.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/442.mcfunction b/data/incendium/functions/border_of_life/notes/442.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/443.mcfunction b/data/incendium/functions/border_of_life/notes/443.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/444.mcfunction b/data/incendium/functions/border_of_life/notes/444.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/445.mcfunction b/data/incendium/functions/border_of_life/notes/445.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/446.mcfunction b/data/incendium/functions/border_of_life/notes/446.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/447.mcfunction b/data/incendium/functions/border_of_life/notes/447.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/448.mcfunction b/data/incendium/functions/border_of_life/notes/448.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/449.mcfunction b/data/incendium/functions/border_of_life/notes/449.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/45.mcfunction b/data/incendium/functions/border_of_life/notes/45.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/450.mcfunction b/data/incendium/functions/border_of_life/notes/450.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/451.mcfunction b/data/incendium/functions/border_of_life/notes/451.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/452.mcfunction b/data/incendium/functions/border_of_life/notes/452.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/453.mcfunction b/data/incendium/functions/border_of_life/notes/453.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/454.mcfunction b/data/incendium/functions/border_of_life/notes/454.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/455.mcfunction b/data/incendium/functions/border_of_life/notes/455.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/456.mcfunction b/data/incendium/functions/border_of_life/notes/456.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/457.mcfunction b/data/incendium/functions/border_of_life/notes/457.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/458.mcfunction b/data/incendium/functions/border_of_life/notes/458.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/459.mcfunction b/data/incendium/functions/border_of_life/notes/459.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/46.mcfunction b/data/incendium/functions/border_of_life/notes/46.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/460.mcfunction b/data/incendium/functions/border_of_life/notes/460.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/461.mcfunction b/data/incendium/functions/border_of_life/notes/461.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/462.mcfunction b/data/incendium/functions/border_of_life/notes/462.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/463.mcfunction b/data/incendium/functions/border_of_life/notes/463.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/464.mcfunction b/data/incendium/functions/border_of_life/notes/464.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/465.mcfunction b/data/incendium/functions/border_of_life/notes/465.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/466.mcfunction b/data/incendium/functions/border_of_life/notes/466.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/467.mcfunction b/data/incendium/functions/border_of_life/notes/467.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/468.mcfunction b/data/incendium/functions/border_of_life/notes/468.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/469.mcfunction b/data/incendium/functions/border_of_life/notes/469.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/47.mcfunction b/data/incendium/functions/border_of_life/notes/47.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/470.mcfunction b/data/incendium/functions/border_of_life/notes/470.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/471.mcfunction b/data/incendium/functions/border_of_life/notes/471.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/472.mcfunction b/data/incendium/functions/border_of_life/notes/472.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/473.mcfunction b/data/incendium/functions/border_of_life/notes/473.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/474.mcfunction b/data/incendium/functions/border_of_life/notes/474.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/475.mcfunction b/data/incendium/functions/border_of_life/notes/475.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/476.mcfunction b/data/incendium/functions/border_of_life/notes/476.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/477.mcfunction b/data/incendium/functions/border_of_life/notes/477.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/478.mcfunction b/data/incendium/functions/border_of_life/notes/478.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/479.mcfunction b/data/incendium/functions/border_of_life/notes/479.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/48.mcfunction b/data/incendium/functions/border_of_life/notes/48.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/480.mcfunction b/data/incendium/functions/border_of_life/notes/480.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/481.mcfunction b/data/incendium/functions/border_of_life/notes/481.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/482.mcfunction b/data/incendium/functions/border_of_life/notes/482.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/483.mcfunction b/data/incendium/functions/border_of_life/notes/483.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/484.mcfunction b/data/incendium/functions/border_of_life/notes/484.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/485.mcfunction b/data/incendium/functions/border_of_life/notes/485.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/486.mcfunction b/data/incendium/functions/border_of_life/notes/486.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/487.mcfunction b/data/incendium/functions/border_of_life/notes/487.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/488.mcfunction b/data/incendium/functions/border_of_life/notes/488.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/489.mcfunction b/data/incendium/functions/border_of_life/notes/489.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/49.mcfunction b/data/incendium/functions/border_of_life/notes/49.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/490.mcfunction b/data/incendium/functions/border_of_life/notes/490.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/491.mcfunction b/data/incendium/functions/border_of_life/notes/491.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/492.mcfunction b/data/incendium/functions/border_of_life/notes/492.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/493.mcfunction b/data/incendium/functions/border_of_life/notes/493.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/494.mcfunction b/data/incendium/functions/border_of_life/notes/494.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/495.mcfunction b/data/incendium/functions/border_of_life/notes/495.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/496.mcfunction b/data/incendium/functions/border_of_life/notes/496.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/497.mcfunction b/data/incendium/functions/border_of_life/notes/497.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/498.mcfunction b/data/incendium/functions/border_of_life/notes/498.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/499.mcfunction b/data/incendium/functions/border_of_life/notes/499.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/5.mcfunction b/data/incendium/functions/border_of_life/notes/5.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/50.mcfunction b/data/incendium/functions/border_of_life/notes/50.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/500.mcfunction b/data/incendium/functions/border_of_life/notes/500.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/501.mcfunction b/data/incendium/functions/border_of_life/notes/501.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/502.mcfunction b/data/incendium/functions/border_of_life/notes/502.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/503.mcfunction b/data/incendium/functions/border_of_life/notes/503.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/504.mcfunction b/data/incendium/functions/border_of_life/notes/504.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/505.mcfunction b/data/incendium/functions/border_of_life/notes/505.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/506.mcfunction b/data/incendium/functions/border_of_life/notes/506.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/507.mcfunction b/data/incendium/functions/border_of_life/notes/507.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/508.mcfunction b/data/incendium/functions/border_of_life/notes/508.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/509.mcfunction b/data/incendium/functions/border_of_life/notes/509.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/51.mcfunction b/data/incendium/functions/border_of_life/notes/51.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/510.mcfunction b/data/incendium/functions/border_of_life/notes/510.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/511.mcfunction b/data/incendium/functions/border_of_life/notes/511.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/512.mcfunction b/data/incendium/functions/border_of_life/notes/512.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/513.mcfunction b/data/incendium/functions/border_of_life/notes/513.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/514.mcfunction b/data/incendium/functions/border_of_life/notes/514.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/515.mcfunction b/data/incendium/functions/border_of_life/notes/515.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/516.mcfunction b/data/incendium/functions/border_of_life/notes/516.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/517.mcfunction b/data/incendium/functions/border_of_life/notes/517.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/518.mcfunction b/data/incendium/functions/border_of_life/notes/518.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/519.mcfunction b/data/incendium/functions/border_of_life/notes/519.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/52.mcfunction b/data/incendium/functions/border_of_life/notes/52.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/520.mcfunction b/data/incendium/functions/border_of_life/notes/520.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/521.mcfunction b/data/incendium/functions/border_of_life/notes/521.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/522.mcfunction b/data/incendium/functions/border_of_life/notes/522.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/523.mcfunction b/data/incendium/functions/border_of_life/notes/523.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/524.mcfunction b/data/incendium/functions/border_of_life/notes/524.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/525.mcfunction b/data/incendium/functions/border_of_life/notes/525.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/526.mcfunction b/data/incendium/functions/border_of_life/notes/526.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/527.mcfunction b/data/incendium/functions/border_of_life/notes/527.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/528.mcfunction b/data/incendium/functions/border_of_life/notes/528.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/529.mcfunction b/data/incendium/functions/border_of_life/notes/529.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/53.mcfunction b/data/incendium/functions/border_of_life/notes/53.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/530.mcfunction b/data/incendium/functions/border_of_life/notes/530.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/531.mcfunction b/data/incendium/functions/border_of_life/notes/531.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/532.mcfunction b/data/incendium/functions/border_of_life/notes/532.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/533.mcfunction b/data/incendium/functions/border_of_life/notes/533.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/534.mcfunction b/data/incendium/functions/border_of_life/notes/534.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/535.mcfunction b/data/incendium/functions/border_of_life/notes/535.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/536.mcfunction b/data/incendium/functions/border_of_life/notes/536.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/537.mcfunction b/data/incendium/functions/border_of_life/notes/537.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/538.mcfunction b/data/incendium/functions/border_of_life/notes/538.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/539.mcfunction b/data/incendium/functions/border_of_life/notes/539.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/54.mcfunction b/data/incendium/functions/border_of_life/notes/54.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/540.mcfunction b/data/incendium/functions/border_of_life/notes/540.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/541.mcfunction b/data/incendium/functions/border_of_life/notes/541.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/542.mcfunction b/data/incendium/functions/border_of_life/notes/542.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/543.mcfunction b/data/incendium/functions/border_of_life/notes/543.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/544.mcfunction b/data/incendium/functions/border_of_life/notes/544.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/545.mcfunction b/data/incendium/functions/border_of_life/notes/545.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/546.mcfunction b/data/incendium/functions/border_of_life/notes/546.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/547.mcfunction b/data/incendium/functions/border_of_life/notes/547.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/548.mcfunction b/data/incendium/functions/border_of_life/notes/548.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/549.mcfunction b/data/incendium/functions/border_of_life/notes/549.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/55.mcfunction b/data/incendium/functions/border_of_life/notes/55.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/550.mcfunction b/data/incendium/functions/border_of_life/notes/550.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/551.mcfunction b/data/incendium/functions/border_of_life/notes/551.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/552.mcfunction b/data/incendium/functions/border_of_life/notes/552.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/553.mcfunction b/data/incendium/functions/border_of_life/notes/553.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/554.mcfunction b/data/incendium/functions/border_of_life/notes/554.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/555.mcfunction b/data/incendium/functions/border_of_life/notes/555.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/556.mcfunction b/data/incendium/functions/border_of_life/notes/556.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/557.mcfunction b/data/incendium/functions/border_of_life/notes/557.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/558.mcfunction b/data/incendium/functions/border_of_life/notes/558.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/559.mcfunction b/data/incendium/functions/border_of_life/notes/559.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/56.mcfunction b/data/incendium/functions/border_of_life/notes/56.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/560.mcfunction b/data/incendium/functions/border_of_life/notes/560.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/561.mcfunction b/data/incendium/functions/border_of_life/notes/561.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/562.mcfunction b/data/incendium/functions/border_of_life/notes/562.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/563.mcfunction b/data/incendium/functions/border_of_life/notes/563.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/564.mcfunction b/data/incendium/functions/border_of_life/notes/564.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/565.mcfunction b/data/incendium/functions/border_of_life/notes/565.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/566.mcfunction b/data/incendium/functions/border_of_life/notes/566.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/567.mcfunction b/data/incendium/functions/border_of_life/notes/567.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/568.mcfunction b/data/incendium/functions/border_of_life/notes/568.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/569.mcfunction b/data/incendium/functions/border_of_life/notes/569.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/57.mcfunction b/data/incendium/functions/border_of_life/notes/57.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/570.mcfunction b/data/incendium/functions/border_of_life/notes/570.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/571.mcfunction b/data/incendium/functions/border_of_life/notes/571.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/572.mcfunction b/data/incendium/functions/border_of_life/notes/572.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/573.mcfunction b/data/incendium/functions/border_of_life/notes/573.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/574.mcfunction b/data/incendium/functions/border_of_life/notes/574.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/575.mcfunction b/data/incendium/functions/border_of_life/notes/575.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/576.mcfunction b/data/incendium/functions/border_of_life/notes/576.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/577.mcfunction b/data/incendium/functions/border_of_life/notes/577.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/578.mcfunction b/data/incendium/functions/border_of_life/notes/578.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/579.mcfunction b/data/incendium/functions/border_of_life/notes/579.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/58.mcfunction b/data/incendium/functions/border_of_life/notes/58.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/580.mcfunction b/data/incendium/functions/border_of_life/notes/580.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/581.mcfunction b/data/incendium/functions/border_of_life/notes/581.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/582.mcfunction b/data/incendium/functions/border_of_life/notes/582.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/583.mcfunction b/data/incendium/functions/border_of_life/notes/583.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/584.mcfunction b/data/incendium/functions/border_of_life/notes/584.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/585.mcfunction b/data/incendium/functions/border_of_life/notes/585.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/586.mcfunction b/data/incendium/functions/border_of_life/notes/586.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/587.mcfunction b/data/incendium/functions/border_of_life/notes/587.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/588.mcfunction b/data/incendium/functions/border_of_life/notes/588.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/589.mcfunction b/data/incendium/functions/border_of_life/notes/589.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/59.mcfunction b/data/incendium/functions/border_of_life/notes/59.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/590.mcfunction b/data/incendium/functions/border_of_life/notes/590.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/591.mcfunction b/data/incendium/functions/border_of_life/notes/591.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/592.mcfunction b/data/incendium/functions/border_of_life/notes/592.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/593.mcfunction b/data/incendium/functions/border_of_life/notes/593.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/594.mcfunction b/data/incendium/functions/border_of_life/notes/594.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/595.mcfunction b/data/incendium/functions/border_of_life/notes/595.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/596.mcfunction b/data/incendium/functions/border_of_life/notes/596.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/597.mcfunction b/data/incendium/functions/border_of_life/notes/597.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/598.mcfunction b/data/incendium/functions/border_of_life/notes/598.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/599.mcfunction b/data/incendium/functions/border_of_life/notes/599.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/6.mcfunction b/data/incendium/functions/border_of_life/notes/6.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/60.mcfunction b/data/incendium/functions/border_of_life/notes/60.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/600.mcfunction b/data/incendium/functions/border_of_life/notes/600.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/601.mcfunction b/data/incendium/functions/border_of_life/notes/601.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/602.mcfunction b/data/incendium/functions/border_of_life/notes/602.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/603.mcfunction b/data/incendium/functions/border_of_life/notes/603.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/604.mcfunction b/data/incendium/functions/border_of_life/notes/604.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/605.mcfunction b/data/incendium/functions/border_of_life/notes/605.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/606.mcfunction b/data/incendium/functions/border_of_life/notes/606.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/607.mcfunction b/data/incendium/functions/border_of_life/notes/607.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/608.mcfunction b/data/incendium/functions/border_of_life/notes/608.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/609.mcfunction b/data/incendium/functions/border_of_life/notes/609.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/61.mcfunction b/data/incendium/functions/border_of_life/notes/61.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/610.mcfunction b/data/incendium/functions/border_of_life/notes/610.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/611.mcfunction b/data/incendium/functions/border_of_life/notes/611.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/612.mcfunction b/data/incendium/functions/border_of_life/notes/612.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/613.mcfunction b/data/incendium/functions/border_of_life/notes/613.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/614.mcfunction b/data/incendium/functions/border_of_life/notes/614.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/615.mcfunction b/data/incendium/functions/border_of_life/notes/615.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/616.mcfunction b/data/incendium/functions/border_of_life/notes/616.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/617.mcfunction b/data/incendium/functions/border_of_life/notes/617.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/618.mcfunction b/data/incendium/functions/border_of_life/notes/618.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/619.mcfunction b/data/incendium/functions/border_of_life/notes/619.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/62.mcfunction b/data/incendium/functions/border_of_life/notes/62.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/620.mcfunction b/data/incendium/functions/border_of_life/notes/620.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/621.mcfunction b/data/incendium/functions/border_of_life/notes/621.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/622.mcfunction b/data/incendium/functions/border_of_life/notes/622.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/623.mcfunction b/data/incendium/functions/border_of_life/notes/623.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/624.mcfunction b/data/incendium/functions/border_of_life/notes/624.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/625.mcfunction b/data/incendium/functions/border_of_life/notes/625.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/626.mcfunction b/data/incendium/functions/border_of_life/notes/626.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/627.mcfunction b/data/incendium/functions/border_of_life/notes/627.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/628.mcfunction b/data/incendium/functions/border_of_life/notes/628.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/629.mcfunction b/data/incendium/functions/border_of_life/notes/629.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/63.mcfunction b/data/incendium/functions/border_of_life/notes/63.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/630.mcfunction b/data/incendium/functions/border_of_life/notes/630.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/631.mcfunction b/data/incendium/functions/border_of_life/notes/631.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/632.mcfunction b/data/incendium/functions/border_of_life/notes/632.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/633.mcfunction b/data/incendium/functions/border_of_life/notes/633.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/634.mcfunction b/data/incendium/functions/border_of_life/notes/634.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/635.mcfunction b/data/incendium/functions/border_of_life/notes/635.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/636.mcfunction b/data/incendium/functions/border_of_life/notes/636.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/637.mcfunction b/data/incendium/functions/border_of_life/notes/637.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/638.mcfunction b/data/incendium/functions/border_of_life/notes/638.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/639.mcfunction b/data/incendium/functions/border_of_life/notes/639.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/64.mcfunction b/data/incendium/functions/border_of_life/notes/64.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/640.mcfunction b/data/incendium/functions/border_of_life/notes/640.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/641.mcfunction b/data/incendium/functions/border_of_life/notes/641.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/642.mcfunction b/data/incendium/functions/border_of_life/notes/642.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/643.mcfunction b/data/incendium/functions/border_of_life/notes/643.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/644.mcfunction b/data/incendium/functions/border_of_life/notes/644.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/645.mcfunction b/data/incendium/functions/border_of_life/notes/645.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/646.mcfunction b/data/incendium/functions/border_of_life/notes/646.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/647.mcfunction b/data/incendium/functions/border_of_life/notes/647.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/648.mcfunction b/data/incendium/functions/border_of_life/notes/648.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/649.mcfunction b/data/incendium/functions/border_of_life/notes/649.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/65.mcfunction b/data/incendium/functions/border_of_life/notes/65.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/650.mcfunction b/data/incendium/functions/border_of_life/notes/650.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/651.mcfunction b/data/incendium/functions/border_of_life/notes/651.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/652.mcfunction b/data/incendium/functions/border_of_life/notes/652.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/653.mcfunction b/data/incendium/functions/border_of_life/notes/653.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/654.mcfunction b/data/incendium/functions/border_of_life/notes/654.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/655.mcfunction b/data/incendium/functions/border_of_life/notes/655.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/656.mcfunction b/data/incendium/functions/border_of_life/notes/656.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/657.mcfunction b/data/incendium/functions/border_of_life/notes/657.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/658.mcfunction b/data/incendium/functions/border_of_life/notes/658.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/659.mcfunction b/data/incendium/functions/border_of_life/notes/659.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/66.mcfunction b/data/incendium/functions/border_of_life/notes/66.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/660.mcfunction b/data/incendium/functions/border_of_life/notes/660.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/661.mcfunction b/data/incendium/functions/border_of_life/notes/661.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/662.mcfunction b/data/incendium/functions/border_of_life/notes/662.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/663.mcfunction b/data/incendium/functions/border_of_life/notes/663.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/664.mcfunction b/data/incendium/functions/border_of_life/notes/664.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/665.mcfunction b/data/incendium/functions/border_of_life/notes/665.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/666.mcfunction b/data/incendium/functions/border_of_life/notes/666.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/667.mcfunction b/data/incendium/functions/border_of_life/notes/667.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/668.mcfunction b/data/incendium/functions/border_of_life/notes/668.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/669.mcfunction b/data/incendium/functions/border_of_life/notes/669.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/67.mcfunction b/data/incendium/functions/border_of_life/notes/67.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/670.mcfunction b/data/incendium/functions/border_of_life/notes/670.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/671.mcfunction b/data/incendium/functions/border_of_life/notes/671.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/672.mcfunction b/data/incendium/functions/border_of_life/notes/672.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/673.mcfunction b/data/incendium/functions/border_of_life/notes/673.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/674.mcfunction b/data/incendium/functions/border_of_life/notes/674.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/675.mcfunction b/data/incendium/functions/border_of_life/notes/675.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/676.mcfunction b/data/incendium/functions/border_of_life/notes/676.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/677.mcfunction b/data/incendium/functions/border_of_life/notes/677.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/678.mcfunction b/data/incendium/functions/border_of_life/notes/678.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/679.mcfunction b/data/incendium/functions/border_of_life/notes/679.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/68.mcfunction b/data/incendium/functions/border_of_life/notes/68.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/680.mcfunction b/data/incendium/functions/border_of_life/notes/680.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/681.mcfunction b/data/incendium/functions/border_of_life/notes/681.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/682.mcfunction b/data/incendium/functions/border_of_life/notes/682.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/683.mcfunction b/data/incendium/functions/border_of_life/notes/683.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/684.mcfunction b/data/incendium/functions/border_of_life/notes/684.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/685.mcfunction b/data/incendium/functions/border_of_life/notes/685.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/686.mcfunction b/data/incendium/functions/border_of_life/notes/686.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/687.mcfunction b/data/incendium/functions/border_of_life/notes/687.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/688.mcfunction b/data/incendium/functions/border_of_life/notes/688.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/689.mcfunction b/data/incendium/functions/border_of_life/notes/689.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/69.mcfunction b/data/incendium/functions/border_of_life/notes/69.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/690.mcfunction b/data/incendium/functions/border_of_life/notes/690.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/691.mcfunction b/data/incendium/functions/border_of_life/notes/691.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/692.mcfunction b/data/incendium/functions/border_of_life/notes/692.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/693.mcfunction b/data/incendium/functions/border_of_life/notes/693.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/694.mcfunction b/data/incendium/functions/border_of_life/notes/694.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/695.mcfunction b/data/incendium/functions/border_of_life/notes/695.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/696.mcfunction b/data/incendium/functions/border_of_life/notes/696.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/697.mcfunction b/data/incendium/functions/border_of_life/notes/697.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/698.mcfunction b/data/incendium/functions/border_of_life/notes/698.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/699.mcfunction b/data/incendium/functions/border_of_life/notes/699.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/7.mcfunction b/data/incendium/functions/border_of_life/notes/7.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/70.mcfunction b/data/incendium/functions/border_of_life/notes/70.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/700.mcfunction b/data/incendium/functions/border_of_life/notes/700.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/701.mcfunction b/data/incendium/functions/border_of_life/notes/701.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/702.mcfunction b/data/incendium/functions/border_of_life/notes/702.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/703.mcfunction b/data/incendium/functions/border_of_life/notes/703.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/704.mcfunction b/data/incendium/functions/border_of_life/notes/704.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/705.mcfunction b/data/incendium/functions/border_of_life/notes/705.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/706.mcfunction b/data/incendium/functions/border_of_life/notes/706.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/707.mcfunction b/data/incendium/functions/border_of_life/notes/707.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/708.mcfunction b/data/incendium/functions/border_of_life/notes/708.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/709.mcfunction b/data/incendium/functions/border_of_life/notes/709.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/71.mcfunction b/data/incendium/functions/border_of_life/notes/71.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/710.mcfunction b/data/incendium/functions/border_of_life/notes/710.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/711.mcfunction b/data/incendium/functions/border_of_life/notes/711.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/712.mcfunction b/data/incendium/functions/border_of_life/notes/712.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/713.mcfunction b/data/incendium/functions/border_of_life/notes/713.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/714.mcfunction b/data/incendium/functions/border_of_life/notes/714.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/715.mcfunction b/data/incendium/functions/border_of_life/notes/715.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/716.mcfunction b/data/incendium/functions/border_of_life/notes/716.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/717.mcfunction b/data/incendium/functions/border_of_life/notes/717.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/718.mcfunction b/data/incendium/functions/border_of_life/notes/718.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/719.mcfunction b/data/incendium/functions/border_of_life/notes/719.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/72.mcfunction b/data/incendium/functions/border_of_life/notes/72.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/720.mcfunction b/data/incendium/functions/border_of_life/notes/720.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/721.mcfunction b/data/incendium/functions/border_of_life/notes/721.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/722.mcfunction b/data/incendium/functions/border_of_life/notes/722.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/723.mcfunction b/data/incendium/functions/border_of_life/notes/723.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/724.mcfunction b/data/incendium/functions/border_of_life/notes/724.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/725.mcfunction b/data/incendium/functions/border_of_life/notes/725.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/726.mcfunction b/data/incendium/functions/border_of_life/notes/726.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/727.mcfunction b/data/incendium/functions/border_of_life/notes/727.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/728.mcfunction b/data/incendium/functions/border_of_life/notes/728.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/729.mcfunction b/data/incendium/functions/border_of_life/notes/729.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/73.mcfunction b/data/incendium/functions/border_of_life/notes/73.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/730.mcfunction b/data/incendium/functions/border_of_life/notes/730.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/731.mcfunction b/data/incendium/functions/border_of_life/notes/731.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/732.mcfunction b/data/incendium/functions/border_of_life/notes/732.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/733.mcfunction b/data/incendium/functions/border_of_life/notes/733.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/734.mcfunction b/data/incendium/functions/border_of_life/notes/734.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/735.mcfunction b/data/incendium/functions/border_of_life/notes/735.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/736.mcfunction b/data/incendium/functions/border_of_life/notes/736.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/737.mcfunction b/data/incendium/functions/border_of_life/notes/737.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/738.mcfunction b/data/incendium/functions/border_of_life/notes/738.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/739.mcfunction b/data/incendium/functions/border_of_life/notes/739.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/74.mcfunction b/data/incendium/functions/border_of_life/notes/74.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/740.mcfunction b/data/incendium/functions/border_of_life/notes/740.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/741.mcfunction b/data/incendium/functions/border_of_life/notes/741.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/742.mcfunction b/data/incendium/functions/border_of_life/notes/742.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/743.mcfunction b/data/incendium/functions/border_of_life/notes/743.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/744.mcfunction b/data/incendium/functions/border_of_life/notes/744.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/745.mcfunction b/data/incendium/functions/border_of_life/notes/745.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/746.mcfunction b/data/incendium/functions/border_of_life/notes/746.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/747.mcfunction b/data/incendium/functions/border_of_life/notes/747.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/748.mcfunction b/data/incendium/functions/border_of_life/notes/748.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/749.mcfunction b/data/incendium/functions/border_of_life/notes/749.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/75.mcfunction b/data/incendium/functions/border_of_life/notes/75.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/750.mcfunction b/data/incendium/functions/border_of_life/notes/750.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/751.mcfunction b/data/incendium/functions/border_of_life/notes/751.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/752.mcfunction b/data/incendium/functions/border_of_life/notes/752.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/753.mcfunction b/data/incendium/functions/border_of_life/notes/753.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/754.mcfunction b/data/incendium/functions/border_of_life/notes/754.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/755.mcfunction b/data/incendium/functions/border_of_life/notes/755.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/756.mcfunction b/data/incendium/functions/border_of_life/notes/756.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/757.mcfunction b/data/incendium/functions/border_of_life/notes/757.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/758.mcfunction b/data/incendium/functions/border_of_life/notes/758.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/759.mcfunction b/data/incendium/functions/border_of_life/notes/759.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/76.mcfunction b/data/incendium/functions/border_of_life/notes/76.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/760.mcfunction b/data/incendium/functions/border_of_life/notes/760.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/761.mcfunction b/data/incendium/functions/border_of_life/notes/761.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/762.mcfunction b/data/incendium/functions/border_of_life/notes/762.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/763.mcfunction b/data/incendium/functions/border_of_life/notes/763.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/764.mcfunction b/data/incendium/functions/border_of_life/notes/764.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/765.mcfunction b/data/incendium/functions/border_of_life/notes/765.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/766.mcfunction b/data/incendium/functions/border_of_life/notes/766.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/767.mcfunction b/data/incendium/functions/border_of_life/notes/767.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/768.mcfunction b/data/incendium/functions/border_of_life/notes/768.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/769.mcfunction b/data/incendium/functions/border_of_life/notes/769.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/77.mcfunction b/data/incendium/functions/border_of_life/notes/77.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/770.mcfunction b/data/incendium/functions/border_of_life/notes/770.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/771.mcfunction b/data/incendium/functions/border_of_life/notes/771.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/772.mcfunction b/data/incendium/functions/border_of_life/notes/772.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/773.mcfunction b/data/incendium/functions/border_of_life/notes/773.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/774.mcfunction b/data/incendium/functions/border_of_life/notes/774.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/775.mcfunction b/data/incendium/functions/border_of_life/notes/775.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/776.mcfunction b/data/incendium/functions/border_of_life/notes/776.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/777.mcfunction b/data/incendium/functions/border_of_life/notes/777.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/778.mcfunction b/data/incendium/functions/border_of_life/notes/778.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/779.mcfunction b/data/incendium/functions/border_of_life/notes/779.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/78.mcfunction b/data/incendium/functions/border_of_life/notes/78.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/780.mcfunction b/data/incendium/functions/border_of_life/notes/780.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/781.mcfunction b/data/incendium/functions/border_of_life/notes/781.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/782.mcfunction b/data/incendium/functions/border_of_life/notes/782.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/783.mcfunction b/data/incendium/functions/border_of_life/notes/783.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/784.mcfunction b/data/incendium/functions/border_of_life/notes/784.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/785.mcfunction b/data/incendium/functions/border_of_life/notes/785.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/786.mcfunction b/data/incendium/functions/border_of_life/notes/786.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/787.mcfunction b/data/incendium/functions/border_of_life/notes/787.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/788.mcfunction b/data/incendium/functions/border_of_life/notes/788.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/789.mcfunction b/data/incendium/functions/border_of_life/notes/789.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/79.mcfunction b/data/incendium/functions/border_of_life/notes/79.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/790.mcfunction b/data/incendium/functions/border_of_life/notes/790.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/791.mcfunction b/data/incendium/functions/border_of_life/notes/791.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/792.mcfunction b/data/incendium/functions/border_of_life/notes/792.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/793.mcfunction b/data/incendium/functions/border_of_life/notes/793.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/794.mcfunction b/data/incendium/functions/border_of_life/notes/794.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/795.mcfunction b/data/incendium/functions/border_of_life/notes/795.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/796.mcfunction b/data/incendium/functions/border_of_life/notes/796.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/797.mcfunction b/data/incendium/functions/border_of_life/notes/797.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/798.mcfunction b/data/incendium/functions/border_of_life/notes/798.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/799.mcfunction b/data/incendium/functions/border_of_life/notes/799.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/8.mcfunction b/data/incendium/functions/border_of_life/notes/8.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/80.mcfunction b/data/incendium/functions/border_of_life/notes/80.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/800.mcfunction b/data/incendium/functions/border_of_life/notes/800.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/801.mcfunction b/data/incendium/functions/border_of_life/notes/801.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/802.mcfunction b/data/incendium/functions/border_of_life/notes/802.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/803.mcfunction b/data/incendium/functions/border_of_life/notes/803.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/804.mcfunction b/data/incendium/functions/border_of_life/notes/804.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/805.mcfunction b/data/incendium/functions/border_of_life/notes/805.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/806.mcfunction b/data/incendium/functions/border_of_life/notes/806.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/807.mcfunction b/data/incendium/functions/border_of_life/notes/807.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/808.mcfunction b/data/incendium/functions/border_of_life/notes/808.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/809.mcfunction b/data/incendium/functions/border_of_life/notes/809.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/81.mcfunction b/data/incendium/functions/border_of_life/notes/81.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/810.mcfunction b/data/incendium/functions/border_of_life/notes/810.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/811.mcfunction b/data/incendium/functions/border_of_life/notes/811.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/812.mcfunction b/data/incendium/functions/border_of_life/notes/812.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/813.mcfunction b/data/incendium/functions/border_of_life/notes/813.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/814.mcfunction b/data/incendium/functions/border_of_life/notes/814.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/815.mcfunction b/data/incendium/functions/border_of_life/notes/815.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/816.mcfunction b/data/incendium/functions/border_of_life/notes/816.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/817.mcfunction b/data/incendium/functions/border_of_life/notes/817.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/818.mcfunction b/data/incendium/functions/border_of_life/notes/818.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/819.mcfunction b/data/incendium/functions/border_of_life/notes/819.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/82.mcfunction b/data/incendium/functions/border_of_life/notes/82.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/820.mcfunction b/data/incendium/functions/border_of_life/notes/820.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/821.mcfunction b/data/incendium/functions/border_of_life/notes/821.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/822.mcfunction b/data/incendium/functions/border_of_life/notes/822.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/823.mcfunction b/data/incendium/functions/border_of_life/notes/823.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/824.mcfunction b/data/incendium/functions/border_of_life/notes/824.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/825.mcfunction b/data/incendium/functions/border_of_life/notes/825.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/826.mcfunction b/data/incendium/functions/border_of_life/notes/826.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/827.mcfunction b/data/incendium/functions/border_of_life/notes/827.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/828.mcfunction b/data/incendium/functions/border_of_life/notes/828.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/829.mcfunction b/data/incendium/functions/border_of_life/notes/829.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/83.mcfunction b/data/incendium/functions/border_of_life/notes/83.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/830.mcfunction b/data/incendium/functions/border_of_life/notes/830.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/831.mcfunction b/data/incendium/functions/border_of_life/notes/831.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/832.mcfunction b/data/incendium/functions/border_of_life/notes/832.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/833.mcfunction b/data/incendium/functions/border_of_life/notes/833.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/834.mcfunction b/data/incendium/functions/border_of_life/notes/834.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/835.mcfunction b/data/incendium/functions/border_of_life/notes/835.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/836.mcfunction b/data/incendium/functions/border_of_life/notes/836.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/837.mcfunction b/data/incendium/functions/border_of_life/notes/837.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/838.mcfunction b/data/incendium/functions/border_of_life/notes/838.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/839.mcfunction b/data/incendium/functions/border_of_life/notes/839.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/84.mcfunction b/data/incendium/functions/border_of_life/notes/84.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/840.mcfunction b/data/incendium/functions/border_of_life/notes/840.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/841.mcfunction b/data/incendium/functions/border_of_life/notes/841.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/842.mcfunction b/data/incendium/functions/border_of_life/notes/842.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/843.mcfunction b/data/incendium/functions/border_of_life/notes/843.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/844.mcfunction b/data/incendium/functions/border_of_life/notes/844.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/845.mcfunction b/data/incendium/functions/border_of_life/notes/845.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/846.mcfunction b/data/incendium/functions/border_of_life/notes/846.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/847.mcfunction b/data/incendium/functions/border_of_life/notes/847.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/848.mcfunction b/data/incendium/functions/border_of_life/notes/848.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/849.mcfunction b/data/incendium/functions/border_of_life/notes/849.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/85.mcfunction b/data/incendium/functions/border_of_life/notes/85.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/850.mcfunction b/data/incendium/functions/border_of_life/notes/850.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/851.mcfunction b/data/incendium/functions/border_of_life/notes/851.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/852.mcfunction b/data/incendium/functions/border_of_life/notes/852.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/853.mcfunction b/data/incendium/functions/border_of_life/notes/853.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/854.mcfunction b/data/incendium/functions/border_of_life/notes/854.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/855.mcfunction b/data/incendium/functions/border_of_life/notes/855.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/856.mcfunction b/data/incendium/functions/border_of_life/notes/856.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/857.mcfunction b/data/incendium/functions/border_of_life/notes/857.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/858.mcfunction b/data/incendium/functions/border_of_life/notes/858.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/859.mcfunction b/data/incendium/functions/border_of_life/notes/859.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/86.mcfunction b/data/incendium/functions/border_of_life/notes/86.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/860.mcfunction b/data/incendium/functions/border_of_life/notes/860.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/861.mcfunction b/data/incendium/functions/border_of_life/notes/861.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/862.mcfunction b/data/incendium/functions/border_of_life/notes/862.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/863.mcfunction b/data/incendium/functions/border_of_life/notes/863.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/864.mcfunction b/data/incendium/functions/border_of_life/notes/864.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/865.mcfunction b/data/incendium/functions/border_of_life/notes/865.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/866.mcfunction b/data/incendium/functions/border_of_life/notes/866.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/867.mcfunction b/data/incendium/functions/border_of_life/notes/867.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/868.mcfunction b/data/incendium/functions/border_of_life/notes/868.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/869.mcfunction b/data/incendium/functions/border_of_life/notes/869.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/87.mcfunction b/data/incendium/functions/border_of_life/notes/87.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/870.mcfunction b/data/incendium/functions/border_of_life/notes/870.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/871.mcfunction b/data/incendium/functions/border_of_life/notes/871.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/872.mcfunction b/data/incendium/functions/border_of_life/notes/872.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/873.mcfunction b/data/incendium/functions/border_of_life/notes/873.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/874.mcfunction b/data/incendium/functions/border_of_life/notes/874.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/875.mcfunction b/data/incendium/functions/border_of_life/notes/875.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/876.mcfunction b/data/incendium/functions/border_of_life/notes/876.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/877.mcfunction b/data/incendium/functions/border_of_life/notes/877.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/878.mcfunction b/data/incendium/functions/border_of_life/notes/878.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/879.mcfunction b/data/incendium/functions/border_of_life/notes/879.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/88.mcfunction b/data/incendium/functions/border_of_life/notes/88.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/880.mcfunction b/data/incendium/functions/border_of_life/notes/880.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/881.mcfunction b/data/incendium/functions/border_of_life/notes/881.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/882.mcfunction b/data/incendium/functions/border_of_life/notes/882.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/883.mcfunction b/data/incendium/functions/border_of_life/notes/883.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/884.mcfunction b/data/incendium/functions/border_of_life/notes/884.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/885.mcfunction b/data/incendium/functions/border_of_life/notes/885.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/886.mcfunction b/data/incendium/functions/border_of_life/notes/886.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/887.mcfunction b/data/incendium/functions/border_of_life/notes/887.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/888.mcfunction b/data/incendium/functions/border_of_life/notes/888.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/889.mcfunction b/data/incendium/functions/border_of_life/notes/889.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/89.mcfunction b/data/incendium/functions/border_of_life/notes/89.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/890.mcfunction b/data/incendium/functions/border_of_life/notes/890.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/891.mcfunction b/data/incendium/functions/border_of_life/notes/891.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/892.mcfunction b/data/incendium/functions/border_of_life/notes/892.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/893.mcfunction b/data/incendium/functions/border_of_life/notes/893.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/894.mcfunction b/data/incendium/functions/border_of_life/notes/894.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/895.mcfunction b/data/incendium/functions/border_of_life/notes/895.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/9.mcfunction b/data/incendium/functions/border_of_life/notes/9.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/90.mcfunction b/data/incendium/functions/border_of_life/notes/90.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/91.mcfunction b/data/incendium/functions/border_of_life/notes/91.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/92.mcfunction b/data/incendium/functions/border_of_life/notes/92.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/93.mcfunction b/data/incendium/functions/border_of_life/notes/93.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/94.mcfunction b/data/incendium/functions/border_of_life/notes/94.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/95.mcfunction b/data/incendium/functions/border_of_life/notes/95.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/96.mcfunction b/data/incendium/functions/border_of_life/notes/96.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/97.mcfunction b/data/incendium/functions/border_of_life/notes/97.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/98.mcfunction b/data/incendium/functions/border_of_life/notes/98.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/notes/99.mcfunction b/data/incendium/functions/border_of_life/notes/99.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/pause.mcfunction b/data/incendium/functions/border_of_life/pause.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/play.mcfunction b/data/incendium/functions/border_of_life/play.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/stop.mcfunction b/data/incendium/functions/border_of_life/stop.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tick.mcfunction b/data/incendium/functions/border_of_life/tick.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/0_1.mcfunction b/data/incendium/functions/border_of_life/tree/0_1.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/0_1023.mcfunction b/data/incendium/functions/border_of_life/tree/0_1023.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/0_127.mcfunction b/data/incendium/functions/border_of_life/tree/0_127.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/0_15.mcfunction b/data/incendium/functions/border_of_life/tree/0_15.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/0_255.mcfunction b/data/incendium/functions/border_of_life/tree/0_255.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/0_3.mcfunction b/data/incendium/functions/border_of_life/tree/0_3.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/0_31.mcfunction b/data/incendium/functions/border_of_life/tree/0_31.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/0_511.mcfunction b/data/incendium/functions/border_of_life/tree/0_511.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/0_63.mcfunction b/data/incendium/functions/border_of_life/tree/0_63.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/0_7.mcfunction b/data/incendium/functions/border_of_life/tree/0_7.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/100_101.mcfunction b/data/incendium/functions/border_of_life/tree/100_101.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/100_103.mcfunction b/data/incendium/functions/border_of_life/tree/100_103.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/102_103.mcfunction b/data/incendium/functions/border_of_life/tree/102_103.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/104_105.mcfunction b/data/incendium/functions/border_of_life/tree/104_105.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/104_107.mcfunction b/data/incendium/functions/border_of_life/tree/104_107.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/104_111.mcfunction b/data/incendium/functions/border_of_life/tree/104_111.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/106_107.mcfunction b/data/incendium/functions/border_of_life/tree/106_107.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/108_109.mcfunction b/data/incendium/functions/border_of_life/tree/108_109.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/108_111.mcfunction b/data/incendium/functions/border_of_life/tree/108_111.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/10_11.mcfunction b/data/incendium/functions/border_of_life/tree/10_11.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/110_111.mcfunction b/data/incendium/functions/border_of_life/tree/110_111.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/112_113.mcfunction b/data/incendium/functions/border_of_life/tree/112_113.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/112_115.mcfunction b/data/incendium/functions/border_of_life/tree/112_115.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/112_119.mcfunction b/data/incendium/functions/border_of_life/tree/112_119.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/112_127.mcfunction b/data/incendium/functions/border_of_life/tree/112_127.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/114_115.mcfunction b/data/incendium/functions/border_of_life/tree/114_115.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/116_117.mcfunction b/data/incendium/functions/border_of_life/tree/116_117.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/116_119.mcfunction b/data/incendium/functions/border_of_life/tree/116_119.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/118_119.mcfunction b/data/incendium/functions/border_of_life/tree/118_119.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/120_121.mcfunction b/data/incendium/functions/border_of_life/tree/120_121.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/120_123.mcfunction b/data/incendium/functions/border_of_life/tree/120_123.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/120_127.mcfunction b/data/incendium/functions/border_of_life/tree/120_127.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/122_123.mcfunction b/data/incendium/functions/border_of_life/tree/122_123.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/124_125.mcfunction b/data/incendium/functions/border_of_life/tree/124_125.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/124_127.mcfunction b/data/incendium/functions/border_of_life/tree/124_127.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/126_127.mcfunction b/data/incendium/functions/border_of_life/tree/126_127.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/128_129.mcfunction b/data/incendium/functions/border_of_life/tree/128_129.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/128_131.mcfunction b/data/incendium/functions/border_of_life/tree/128_131.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/128_135.mcfunction b/data/incendium/functions/border_of_life/tree/128_135.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/128_143.mcfunction b/data/incendium/functions/border_of_life/tree/128_143.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/128_159.mcfunction b/data/incendium/functions/border_of_life/tree/128_159.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/128_191.mcfunction b/data/incendium/functions/border_of_life/tree/128_191.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/128_255.mcfunction b/data/incendium/functions/border_of_life/tree/128_255.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/12_13.mcfunction b/data/incendium/functions/border_of_life/tree/12_13.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/12_15.mcfunction b/data/incendium/functions/border_of_life/tree/12_15.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/130_131.mcfunction b/data/incendium/functions/border_of_life/tree/130_131.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/132_133.mcfunction b/data/incendium/functions/border_of_life/tree/132_133.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/132_135.mcfunction b/data/incendium/functions/border_of_life/tree/132_135.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/134_135.mcfunction b/data/incendium/functions/border_of_life/tree/134_135.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/136_137.mcfunction b/data/incendium/functions/border_of_life/tree/136_137.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/136_139.mcfunction b/data/incendium/functions/border_of_life/tree/136_139.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/136_143.mcfunction b/data/incendium/functions/border_of_life/tree/136_143.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/138_139.mcfunction b/data/incendium/functions/border_of_life/tree/138_139.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/140_141.mcfunction b/data/incendium/functions/border_of_life/tree/140_141.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/140_143.mcfunction b/data/incendium/functions/border_of_life/tree/140_143.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/142_143.mcfunction b/data/incendium/functions/border_of_life/tree/142_143.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/144_145.mcfunction b/data/incendium/functions/border_of_life/tree/144_145.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/144_147.mcfunction b/data/incendium/functions/border_of_life/tree/144_147.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/144_151.mcfunction b/data/incendium/functions/border_of_life/tree/144_151.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/144_159.mcfunction b/data/incendium/functions/border_of_life/tree/144_159.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/146_147.mcfunction b/data/incendium/functions/border_of_life/tree/146_147.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/148_149.mcfunction b/data/incendium/functions/border_of_life/tree/148_149.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/148_151.mcfunction b/data/incendium/functions/border_of_life/tree/148_151.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/14_15.mcfunction b/data/incendium/functions/border_of_life/tree/14_15.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/150_151.mcfunction b/data/incendium/functions/border_of_life/tree/150_151.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/152_153.mcfunction b/data/incendium/functions/border_of_life/tree/152_153.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/152_155.mcfunction b/data/incendium/functions/border_of_life/tree/152_155.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/152_159.mcfunction b/data/incendium/functions/border_of_life/tree/152_159.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/154_155.mcfunction b/data/incendium/functions/border_of_life/tree/154_155.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/156_157.mcfunction b/data/incendium/functions/border_of_life/tree/156_157.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/156_159.mcfunction b/data/incendium/functions/border_of_life/tree/156_159.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/158_159.mcfunction b/data/incendium/functions/border_of_life/tree/158_159.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/160_161.mcfunction b/data/incendium/functions/border_of_life/tree/160_161.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/160_163.mcfunction b/data/incendium/functions/border_of_life/tree/160_163.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/160_167.mcfunction b/data/incendium/functions/border_of_life/tree/160_167.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/160_175.mcfunction b/data/incendium/functions/border_of_life/tree/160_175.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/160_191.mcfunction b/data/incendium/functions/border_of_life/tree/160_191.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/162_163.mcfunction b/data/incendium/functions/border_of_life/tree/162_163.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/164_165.mcfunction b/data/incendium/functions/border_of_life/tree/164_165.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/164_167.mcfunction b/data/incendium/functions/border_of_life/tree/164_167.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/166_167.mcfunction b/data/incendium/functions/border_of_life/tree/166_167.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/168_169.mcfunction b/data/incendium/functions/border_of_life/tree/168_169.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/168_171.mcfunction b/data/incendium/functions/border_of_life/tree/168_171.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/168_175.mcfunction b/data/incendium/functions/border_of_life/tree/168_175.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/16_17.mcfunction b/data/incendium/functions/border_of_life/tree/16_17.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/16_19.mcfunction b/data/incendium/functions/border_of_life/tree/16_19.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/16_23.mcfunction b/data/incendium/functions/border_of_life/tree/16_23.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/16_31.mcfunction b/data/incendium/functions/border_of_life/tree/16_31.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/170_171.mcfunction b/data/incendium/functions/border_of_life/tree/170_171.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/172_173.mcfunction b/data/incendium/functions/border_of_life/tree/172_173.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/172_175.mcfunction b/data/incendium/functions/border_of_life/tree/172_175.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/174_175.mcfunction b/data/incendium/functions/border_of_life/tree/174_175.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/176_177.mcfunction b/data/incendium/functions/border_of_life/tree/176_177.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/176_179.mcfunction b/data/incendium/functions/border_of_life/tree/176_179.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/176_183.mcfunction b/data/incendium/functions/border_of_life/tree/176_183.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/176_191.mcfunction b/data/incendium/functions/border_of_life/tree/176_191.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/178_179.mcfunction b/data/incendium/functions/border_of_life/tree/178_179.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/180_181.mcfunction b/data/incendium/functions/border_of_life/tree/180_181.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/180_183.mcfunction b/data/incendium/functions/border_of_life/tree/180_183.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/182_183.mcfunction b/data/incendium/functions/border_of_life/tree/182_183.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/184_185.mcfunction b/data/incendium/functions/border_of_life/tree/184_185.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/184_187.mcfunction b/data/incendium/functions/border_of_life/tree/184_187.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/184_191.mcfunction b/data/incendium/functions/border_of_life/tree/184_191.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/186_187.mcfunction b/data/incendium/functions/border_of_life/tree/186_187.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/188_189.mcfunction b/data/incendium/functions/border_of_life/tree/188_189.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/188_191.mcfunction b/data/incendium/functions/border_of_life/tree/188_191.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/18_19.mcfunction b/data/incendium/functions/border_of_life/tree/18_19.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/190_191.mcfunction b/data/incendium/functions/border_of_life/tree/190_191.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/192_193.mcfunction b/data/incendium/functions/border_of_life/tree/192_193.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/192_195.mcfunction b/data/incendium/functions/border_of_life/tree/192_195.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/192_199.mcfunction b/data/incendium/functions/border_of_life/tree/192_199.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/192_207.mcfunction b/data/incendium/functions/border_of_life/tree/192_207.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/192_223.mcfunction b/data/incendium/functions/border_of_life/tree/192_223.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/192_255.mcfunction b/data/incendium/functions/border_of_life/tree/192_255.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/194_195.mcfunction b/data/incendium/functions/border_of_life/tree/194_195.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/196_197.mcfunction b/data/incendium/functions/border_of_life/tree/196_197.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/196_199.mcfunction b/data/incendium/functions/border_of_life/tree/196_199.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/198_199.mcfunction b/data/incendium/functions/border_of_life/tree/198_199.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/200_201.mcfunction b/data/incendium/functions/border_of_life/tree/200_201.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/200_203.mcfunction b/data/incendium/functions/border_of_life/tree/200_203.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/200_207.mcfunction b/data/incendium/functions/border_of_life/tree/200_207.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/202_203.mcfunction b/data/incendium/functions/border_of_life/tree/202_203.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/204_205.mcfunction b/data/incendium/functions/border_of_life/tree/204_205.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/204_207.mcfunction b/data/incendium/functions/border_of_life/tree/204_207.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/206_207.mcfunction b/data/incendium/functions/border_of_life/tree/206_207.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/208_209.mcfunction b/data/incendium/functions/border_of_life/tree/208_209.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/208_211.mcfunction b/data/incendium/functions/border_of_life/tree/208_211.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/208_215.mcfunction b/data/incendium/functions/border_of_life/tree/208_215.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/208_223.mcfunction b/data/incendium/functions/border_of_life/tree/208_223.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/20_21.mcfunction b/data/incendium/functions/border_of_life/tree/20_21.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/20_23.mcfunction b/data/incendium/functions/border_of_life/tree/20_23.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/210_211.mcfunction b/data/incendium/functions/border_of_life/tree/210_211.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/212_213.mcfunction b/data/incendium/functions/border_of_life/tree/212_213.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/212_215.mcfunction b/data/incendium/functions/border_of_life/tree/212_215.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/214_215.mcfunction b/data/incendium/functions/border_of_life/tree/214_215.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/216_217.mcfunction b/data/incendium/functions/border_of_life/tree/216_217.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/216_219.mcfunction b/data/incendium/functions/border_of_life/tree/216_219.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/216_223.mcfunction b/data/incendium/functions/border_of_life/tree/216_223.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/218_219.mcfunction b/data/incendium/functions/border_of_life/tree/218_219.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/220_221.mcfunction b/data/incendium/functions/border_of_life/tree/220_221.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/220_223.mcfunction b/data/incendium/functions/border_of_life/tree/220_223.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/222_223.mcfunction b/data/incendium/functions/border_of_life/tree/222_223.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/224_225.mcfunction b/data/incendium/functions/border_of_life/tree/224_225.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/224_227.mcfunction b/data/incendium/functions/border_of_life/tree/224_227.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/224_231.mcfunction b/data/incendium/functions/border_of_life/tree/224_231.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/224_239.mcfunction b/data/incendium/functions/border_of_life/tree/224_239.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/224_255.mcfunction b/data/incendium/functions/border_of_life/tree/224_255.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/226_227.mcfunction b/data/incendium/functions/border_of_life/tree/226_227.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/228_229.mcfunction b/data/incendium/functions/border_of_life/tree/228_229.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/228_231.mcfunction b/data/incendium/functions/border_of_life/tree/228_231.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/22_23.mcfunction b/data/incendium/functions/border_of_life/tree/22_23.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/230_231.mcfunction b/data/incendium/functions/border_of_life/tree/230_231.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/232_233.mcfunction b/data/incendium/functions/border_of_life/tree/232_233.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/232_235.mcfunction b/data/incendium/functions/border_of_life/tree/232_235.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/232_239.mcfunction b/data/incendium/functions/border_of_life/tree/232_239.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/234_235.mcfunction b/data/incendium/functions/border_of_life/tree/234_235.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/236_237.mcfunction b/data/incendium/functions/border_of_life/tree/236_237.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/236_239.mcfunction b/data/incendium/functions/border_of_life/tree/236_239.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/238_239.mcfunction b/data/incendium/functions/border_of_life/tree/238_239.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/240_241.mcfunction b/data/incendium/functions/border_of_life/tree/240_241.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/240_243.mcfunction b/data/incendium/functions/border_of_life/tree/240_243.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/240_247.mcfunction b/data/incendium/functions/border_of_life/tree/240_247.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/240_255.mcfunction b/data/incendium/functions/border_of_life/tree/240_255.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/242_243.mcfunction b/data/incendium/functions/border_of_life/tree/242_243.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/244_245.mcfunction b/data/incendium/functions/border_of_life/tree/244_245.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/244_247.mcfunction b/data/incendium/functions/border_of_life/tree/244_247.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/246_247.mcfunction b/data/incendium/functions/border_of_life/tree/246_247.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/248_249.mcfunction b/data/incendium/functions/border_of_life/tree/248_249.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/248_251.mcfunction b/data/incendium/functions/border_of_life/tree/248_251.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/248_255.mcfunction b/data/incendium/functions/border_of_life/tree/248_255.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/24_25.mcfunction b/data/incendium/functions/border_of_life/tree/24_25.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/24_27.mcfunction b/data/incendium/functions/border_of_life/tree/24_27.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/24_31.mcfunction b/data/incendium/functions/border_of_life/tree/24_31.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/250_251.mcfunction b/data/incendium/functions/border_of_life/tree/250_251.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/252_253.mcfunction b/data/incendium/functions/border_of_life/tree/252_253.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/252_255.mcfunction b/data/incendium/functions/border_of_life/tree/252_255.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/254_255.mcfunction b/data/incendium/functions/border_of_life/tree/254_255.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/256_257.mcfunction b/data/incendium/functions/border_of_life/tree/256_257.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/256_259.mcfunction b/data/incendium/functions/border_of_life/tree/256_259.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/256_263.mcfunction b/data/incendium/functions/border_of_life/tree/256_263.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/256_271.mcfunction b/data/incendium/functions/border_of_life/tree/256_271.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/256_287.mcfunction b/data/incendium/functions/border_of_life/tree/256_287.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/256_319.mcfunction b/data/incendium/functions/border_of_life/tree/256_319.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/256_383.mcfunction b/data/incendium/functions/border_of_life/tree/256_383.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/256_511.mcfunction b/data/incendium/functions/border_of_life/tree/256_511.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/258_259.mcfunction b/data/incendium/functions/border_of_life/tree/258_259.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/260_261.mcfunction b/data/incendium/functions/border_of_life/tree/260_261.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/260_263.mcfunction b/data/incendium/functions/border_of_life/tree/260_263.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/262_263.mcfunction b/data/incendium/functions/border_of_life/tree/262_263.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/264_265.mcfunction b/data/incendium/functions/border_of_life/tree/264_265.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/264_267.mcfunction b/data/incendium/functions/border_of_life/tree/264_267.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/264_271.mcfunction b/data/incendium/functions/border_of_life/tree/264_271.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/266_267.mcfunction b/data/incendium/functions/border_of_life/tree/266_267.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/268_269.mcfunction b/data/incendium/functions/border_of_life/tree/268_269.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/268_271.mcfunction b/data/incendium/functions/border_of_life/tree/268_271.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/26_27.mcfunction b/data/incendium/functions/border_of_life/tree/26_27.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/270_271.mcfunction b/data/incendium/functions/border_of_life/tree/270_271.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/272_273.mcfunction b/data/incendium/functions/border_of_life/tree/272_273.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/272_275.mcfunction b/data/incendium/functions/border_of_life/tree/272_275.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/272_279.mcfunction b/data/incendium/functions/border_of_life/tree/272_279.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/272_287.mcfunction b/data/incendium/functions/border_of_life/tree/272_287.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/274_275.mcfunction b/data/incendium/functions/border_of_life/tree/274_275.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/276_277.mcfunction b/data/incendium/functions/border_of_life/tree/276_277.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/276_279.mcfunction b/data/incendium/functions/border_of_life/tree/276_279.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/278_279.mcfunction b/data/incendium/functions/border_of_life/tree/278_279.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/280_281.mcfunction b/data/incendium/functions/border_of_life/tree/280_281.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/280_283.mcfunction b/data/incendium/functions/border_of_life/tree/280_283.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/280_287.mcfunction b/data/incendium/functions/border_of_life/tree/280_287.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/282_283.mcfunction b/data/incendium/functions/border_of_life/tree/282_283.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/284_285.mcfunction b/data/incendium/functions/border_of_life/tree/284_285.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/284_287.mcfunction b/data/incendium/functions/border_of_life/tree/284_287.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/286_287.mcfunction b/data/incendium/functions/border_of_life/tree/286_287.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/288_289.mcfunction b/data/incendium/functions/border_of_life/tree/288_289.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/288_291.mcfunction b/data/incendium/functions/border_of_life/tree/288_291.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/288_295.mcfunction b/data/incendium/functions/border_of_life/tree/288_295.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/288_303.mcfunction b/data/incendium/functions/border_of_life/tree/288_303.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/288_319.mcfunction b/data/incendium/functions/border_of_life/tree/288_319.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/28_29.mcfunction b/data/incendium/functions/border_of_life/tree/28_29.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/28_31.mcfunction b/data/incendium/functions/border_of_life/tree/28_31.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/290_291.mcfunction b/data/incendium/functions/border_of_life/tree/290_291.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/292_293.mcfunction b/data/incendium/functions/border_of_life/tree/292_293.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/292_295.mcfunction b/data/incendium/functions/border_of_life/tree/292_295.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/294_295.mcfunction b/data/incendium/functions/border_of_life/tree/294_295.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/296_297.mcfunction b/data/incendium/functions/border_of_life/tree/296_297.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/296_299.mcfunction b/data/incendium/functions/border_of_life/tree/296_299.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/296_303.mcfunction b/data/incendium/functions/border_of_life/tree/296_303.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/298_299.mcfunction b/data/incendium/functions/border_of_life/tree/298_299.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/2_3.mcfunction b/data/incendium/functions/border_of_life/tree/2_3.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/300_301.mcfunction b/data/incendium/functions/border_of_life/tree/300_301.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/300_303.mcfunction b/data/incendium/functions/border_of_life/tree/300_303.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/302_303.mcfunction b/data/incendium/functions/border_of_life/tree/302_303.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/304_305.mcfunction b/data/incendium/functions/border_of_life/tree/304_305.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/304_307.mcfunction b/data/incendium/functions/border_of_life/tree/304_307.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/304_311.mcfunction b/data/incendium/functions/border_of_life/tree/304_311.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/304_319.mcfunction b/data/incendium/functions/border_of_life/tree/304_319.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/306_307.mcfunction b/data/incendium/functions/border_of_life/tree/306_307.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/308_309.mcfunction b/data/incendium/functions/border_of_life/tree/308_309.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/308_311.mcfunction b/data/incendium/functions/border_of_life/tree/308_311.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/30_31.mcfunction b/data/incendium/functions/border_of_life/tree/30_31.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/310_311.mcfunction b/data/incendium/functions/border_of_life/tree/310_311.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/312_313.mcfunction b/data/incendium/functions/border_of_life/tree/312_313.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/312_315.mcfunction b/data/incendium/functions/border_of_life/tree/312_315.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/312_319.mcfunction b/data/incendium/functions/border_of_life/tree/312_319.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/314_315.mcfunction b/data/incendium/functions/border_of_life/tree/314_315.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/316_317.mcfunction b/data/incendium/functions/border_of_life/tree/316_317.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/316_319.mcfunction b/data/incendium/functions/border_of_life/tree/316_319.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/318_319.mcfunction b/data/incendium/functions/border_of_life/tree/318_319.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/320_321.mcfunction b/data/incendium/functions/border_of_life/tree/320_321.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/320_323.mcfunction b/data/incendium/functions/border_of_life/tree/320_323.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/320_327.mcfunction b/data/incendium/functions/border_of_life/tree/320_327.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/320_335.mcfunction b/data/incendium/functions/border_of_life/tree/320_335.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/320_351.mcfunction b/data/incendium/functions/border_of_life/tree/320_351.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/320_383.mcfunction b/data/incendium/functions/border_of_life/tree/320_383.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/322_323.mcfunction b/data/incendium/functions/border_of_life/tree/322_323.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/324_325.mcfunction b/data/incendium/functions/border_of_life/tree/324_325.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/324_327.mcfunction b/data/incendium/functions/border_of_life/tree/324_327.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/326_327.mcfunction b/data/incendium/functions/border_of_life/tree/326_327.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/328_329.mcfunction b/data/incendium/functions/border_of_life/tree/328_329.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/328_331.mcfunction b/data/incendium/functions/border_of_life/tree/328_331.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/328_335.mcfunction b/data/incendium/functions/border_of_life/tree/328_335.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/32_33.mcfunction b/data/incendium/functions/border_of_life/tree/32_33.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/32_35.mcfunction b/data/incendium/functions/border_of_life/tree/32_35.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/32_39.mcfunction b/data/incendium/functions/border_of_life/tree/32_39.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/32_47.mcfunction b/data/incendium/functions/border_of_life/tree/32_47.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/32_63.mcfunction b/data/incendium/functions/border_of_life/tree/32_63.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/330_331.mcfunction b/data/incendium/functions/border_of_life/tree/330_331.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/332_333.mcfunction b/data/incendium/functions/border_of_life/tree/332_333.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/332_335.mcfunction b/data/incendium/functions/border_of_life/tree/332_335.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/334_335.mcfunction b/data/incendium/functions/border_of_life/tree/334_335.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/336_337.mcfunction b/data/incendium/functions/border_of_life/tree/336_337.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/336_339.mcfunction b/data/incendium/functions/border_of_life/tree/336_339.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/336_343.mcfunction b/data/incendium/functions/border_of_life/tree/336_343.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/336_351.mcfunction b/data/incendium/functions/border_of_life/tree/336_351.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/338_339.mcfunction b/data/incendium/functions/border_of_life/tree/338_339.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/340_341.mcfunction b/data/incendium/functions/border_of_life/tree/340_341.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/340_343.mcfunction b/data/incendium/functions/border_of_life/tree/340_343.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/342_343.mcfunction b/data/incendium/functions/border_of_life/tree/342_343.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/344_345.mcfunction b/data/incendium/functions/border_of_life/tree/344_345.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/344_347.mcfunction b/data/incendium/functions/border_of_life/tree/344_347.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/344_351.mcfunction b/data/incendium/functions/border_of_life/tree/344_351.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/346_347.mcfunction b/data/incendium/functions/border_of_life/tree/346_347.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/348_349.mcfunction b/data/incendium/functions/border_of_life/tree/348_349.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/348_351.mcfunction b/data/incendium/functions/border_of_life/tree/348_351.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/34_35.mcfunction b/data/incendium/functions/border_of_life/tree/34_35.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/350_351.mcfunction b/data/incendium/functions/border_of_life/tree/350_351.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/352_353.mcfunction b/data/incendium/functions/border_of_life/tree/352_353.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/352_355.mcfunction b/data/incendium/functions/border_of_life/tree/352_355.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/352_359.mcfunction b/data/incendium/functions/border_of_life/tree/352_359.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/352_367.mcfunction b/data/incendium/functions/border_of_life/tree/352_367.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/352_383.mcfunction b/data/incendium/functions/border_of_life/tree/352_383.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/354_355.mcfunction b/data/incendium/functions/border_of_life/tree/354_355.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/356_357.mcfunction b/data/incendium/functions/border_of_life/tree/356_357.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/356_359.mcfunction b/data/incendium/functions/border_of_life/tree/356_359.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/358_359.mcfunction b/data/incendium/functions/border_of_life/tree/358_359.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/360_361.mcfunction b/data/incendium/functions/border_of_life/tree/360_361.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/360_363.mcfunction b/data/incendium/functions/border_of_life/tree/360_363.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/360_367.mcfunction b/data/incendium/functions/border_of_life/tree/360_367.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/362_363.mcfunction b/data/incendium/functions/border_of_life/tree/362_363.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/364_365.mcfunction b/data/incendium/functions/border_of_life/tree/364_365.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/364_367.mcfunction b/data/incendium/functions/border_of_life/tree/364_367.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/366_367.mcfunction b/data/incendium/functions/border_of_life/tree/366_367.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/368_369.mcfunction b/data/incendium/functions/border_of_life/tree/368_369.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/368_371.mcfunction b/data/incendium/functions/border_of_life/tree/368_371.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/368_375.mcfunction b/data/incendium/functions/border_of_life/tree/368_375.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/368_383.mcfunction b/data/incendium/functions/border_of_life/tree/368_383.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/36_37.mcfunction b/data/incendium/functions/border_of_life/tree/36_37.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/36_39.mcfunction b/data/incendium/functions/border_of_life/tree/36_39.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/370_371.mcfunction b/data/incendium/functions/border_of_life/tree/370_371.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/372_373.mcfunction b/data/incendium/functions/border_of_life/tree/372_373.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/372_375.mcfunction b/data/incendium/functions/border_of_life/tree/372_375.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/374_375.mcfunction b/data/incendium/functions/border_of_life/tree/374_375.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/376_377.mcfunction b/data/incendium/functions/border_of_life/tree/376_377.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/376_379.mcfunction b/data/incendium/functions/border_of_life/tree/376_379.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/376_383.mcfunction b/data/incendium/functions/border_of_life/tree/376_383.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/378_379.mcfunction b/data/incendium/functions/border_of_life/tree/378_379.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/380_381.mcfunction b/data/incendium/functions/border_of_life/tree/380_381.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/380_383.mcfunction b/data/incendium/functions/border_of_life/tree/380_383.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/382_383.mcfunction b/data/incendium/functions/border_of_life/tree/382_383.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/384_385.mcfunction b/data/incendium/functions/border_of_life/tree/384_385.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/384_387.mcfunction b/data/incendium/functions/border_of_life/tree/384_387.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/384_391.mcfunction b/data/incendium/functions/border_of_life/tree/384_391.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/384_399.mcfunction b/data/incendium/functions/border_of_life/tree/384_399.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/384_415.mcfunction b/data/incendium/functions/border_of_life/tree/384_415.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/384_447.mcfunction b/data/incendium/functions/border_of_life/tree/384_447.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/384_511.mcfunction b/data/incendium/functions/border_of_life/tree/384_511.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/386_387.mcfunction b/data/incendium/functions/border_of_life/tree/386_387.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/388_389.mcfunction b/data/incendium/functions/border_of_life/tree/388_389.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/388_391.mcfunction b/data/incendium/functions/border_of_life/tree/388_391.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/38_39.mcfunction b/data/incendium/functions/border_of_life/tree/38_39.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/390_391.mcfunction b/data/incendium/functions/border_of_life/tree/390_391.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/392_393.mcfunction b/data/incendium/functions/border_of_life/tree/392_393.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/392_395.mcfunction b/data/incendium/functions/border_of_life/tree/392_395.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/392_399.mcfunction b/data/incendium/functions/border_of_life/tree/392_399.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/394_395.mcfunction b/data/incendium/functions/border_of_life/tree/394_395.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/396_397.mcfunction b/data/incendium/functions/border_of_life/tree/396_397.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/396_399.mcfunction b/data/incendium/functions/border_of_life/tree/396_399.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/398_399.mcfunction b/data/incendium/functions/border_of_life/tree/398_399.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/400_401.mcfunction b/data/incendium/functions/border_of_life/tree/400_401.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/400_403.mcfunction b/data/incendium/functions/border_of_life/tree/400_403.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/400_407.mcfunction b/data/incendium/functions/border_of_life/tree/400_407.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/400_415.mcfunction b/data/incendium/functions/border_of_life/tree/400_415.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/402_403.mcfunction b/data/incendium/functions/border_of_life/tree/402_403.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/404_405.mcfunction b/data/incendium/functions/border_of_life/tree/404_405.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/404_407.mcfunction b/data/incendium/functions/border_of_life/tree/404_407.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/406_407.mcfunction b/data/incendium/functions/border_of_life/tree/406_407.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/408_409.mcfunction b/data/incendium/functions/border_of_life/tree/408_409.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/408_411.mcfunction b/data/incendium/functions/border_of_life/tree/408_411.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/408_415.mcfunction b/data/incendium/functions/border_of_life/tree/408_415.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/40_41.mcfunction b/data/incendium/functions/border_of_life/tree/40_41.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/40_43.mcfunction b/data/incendium/functions/border_of_life/tree/40_43.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/40_47.mcfunction b/data/incendium/functions/border_of_life/tree/40_47.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/410_411.mcfunction b/data/incendium/functions/border_of_life/tree/410_411.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/412_413.mcfunction b/data/incendium/functions/border_of_life/tree/412_413.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/412_415.mcfunction b/data/incendium/functions/border_of_life/tree/412_415.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/414_415.mcfunction b/data/incendium/functions/border_of_life/tree/414_415.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/416_417.mcfunction b/data/incendium/functions/border_of_life/tree/416_417.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/416_419.mcfunction b/data/incendium/functions/border_of_life/tree/416_419.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/416_423.mcfunction b/data/incendium/functions/border_of_life/tree/416_423.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/416_431.mcfunction b/data/incendium/functions/border_of_life/tree/416_431.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/416_447.mcfunction b/data/incendium/functions/border_of_life/tree/416_447.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/418_419.mcfunction b/data/incendium/functions/border_of_life/tree/418_419.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/420_421.mcfunction b/data/incendium/functions/border_of_life/tree/420_421.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/420_423.mcfunction b/data/incendium/functions/border_of_life/tree/420_423.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/422_423.mcfunction b/data/incendium/functions/border_of_life/tree/422_423.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/424_425.mcfunction b/data/incendium/functions/border_of_life/tree/424_425.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/424_427.mcfunction b/data/incendium/functions/border_of_life/tree/424_427.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/424_431.mcfunction b/data/incendium/functions/border_of_life/tree/424_431.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/426_427.mcfunction b/data/incendium/functions/border_of_life/tree/426_427.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/428_429.mcfunction b/data/incendium/functions/border_of_life/tree/428_429.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/428_431.mcfunction b/data/incendium/functions/border_of_life/tree/428_431.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/42_43.mcfunction b/data/incendium/functions/border_of_life/tree/42_43.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/430_431.mcfunction b/data/incendium/functions/border_of_life/tree/430_431.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/432_433.mcfunction b/data/incendium/functions/border_of_life/tree/432_433.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/432_435.mcfunction b/data/incendium/functions/border_of_life/tree/432_435.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/432_439.mcfunction b/data/incendium/functions/border_of_life/tree/432_439.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/432_447.mcfunction b/data/incendium/functions/border_of_life/tree/432_447.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/434_435.mcfunction b/data/incendium/functions/border_of_life/tree/434_435.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/436_437.mcfunction b/data/incendium/functions/border_of_life/tree/436_437.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/436_439.mcfunction b/data/incendium/functions/border_of_life/tree/436_439.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/438_439.mcfunction b/data/incendium/functions/border_of_life/tree/438_439.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/440_441.mcfunction b/data/incendium/functions/border_of_life/tree/440_441.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/440_443.mcfunction b/data/incendium/functions/border_of_life/tree/440_443.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/440_447.mcfunction b/data/incendium/functions/border_of_life/tree/440_447.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/442_443.mcfunction b/data/incendium/functions/border_of_life/tree/442_443.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/444_445.mcfunction b/data/incendium/functions/border_of_life/tree/444_445.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/444_447.mcfunction b/data/incendium/functions/border_of_life/tree/444_447.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/446_447.mcfunction b/data/incendium/functions/border_of_life/tree/446_447.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/448_449.mcfunction b/data/incendium/functions/border_of_life/tree/448_449.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/448_451.mcfunction b/data/incendium/functions/border_of_life/tree/448_451.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/448_455.mcfunction b/data/incendium/functions/border_of_life/tree/448_455.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/448_463.mcfunction b/data/incendium/functions/border_of_life/tree/448_463.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/448_479.mcfunction b/data/incendium/functions/border_of_life/tree/448_479.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/448_511.mcfunction b/data/incendium/functions/border_of_life/tree/448_511.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/44_45.mcfunction b/data/incendium/functions/border_of_life/tree/44_45.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/44_47.mcfunction b/data/incendium/functions/border_of_life/tree/44_47.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/450_451.mcfunction b/data/incendium/functions/border_of_life/tree/450_451.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/452_453.mcfunction b/data/incendium/functions/border_of_life/tree/452_453.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/452_455.mcfunction b/data/incendium/functions/border_of_life/tree/452_455.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/454_455.mcfunction b/data/incendium/functions/border_of_life/tree/454_455.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/456_457.mcfunction b/data/incendium/functions/border_of_life/tree/456_457.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/456_459.mcfunction b/data/incendium/functions/border_of_life/tree/456_459.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/456_463.mcfunction b/data/incendium/functions/border_of_life/tree/456_463.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/458_459.mcfunction b/data/incendium/functions/border_of_life/tree/458_459.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/460_461.mcfunction b/data/incendium/functions/border_of_life/tree/460_461.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/460_463.mcfunction b/data/incendium/functions/border_of_life/tree/460_463.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/462_463.mcfunction b/data/incendium/functions/border_of_life/tree/462_463.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/464_465.mcfunction b/data/incendium/functions/border_of_life/tree/464_465.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/464_467.mcfunction b/data/incendium/functions/border_of_life/tree/464_467.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/464_471.mcfunction b/data/incendium/functions/border_of_life/tree/464_471.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/464_479.mcfunction b/data/incendium/functions/border_of_life/tree/464_479.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/466_467.mcfunction b/data/incendium/functions/border_of_life/tree/466_467.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/468_469.mcfunction b/data/incendium/functions/border_of_life/tree/468_469.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/468_471.mcfunction b/data/incendium/functions/border_of_life/tree/468_471.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/46_47.mcfunction b/data/incendium/functions/border_of_life/tree/46_47.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/470_471.mcfunction b/data/incendium/functions/border_of_life/tree/470_471.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/472_473.mcfunction b/data/incendium/functions/border_of_life/tree/472_473.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/472_475.mcfunction b/data/incendium/functions/border_of_life/tree/472_475.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/472_479.mcfunction b/data/incendium/functions/border_of_life/tree/472_479.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/474_475.mcfunction b/data/incendium/functions/border_of_life/tree/474_475.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/476_477.mcfunction b/data/incendium/functions/border_of_life/tree/476_477.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/476_479.mcfunction b/data/incendium/functions/border_of_life/tree/476_479.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/478_479.mcfunction b/data/incendium/functions/border_of_life/tree/478_479.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/480_481.mcfunction b/data/incendium/functions/border_of_life/tree/480_481.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/480_483.mcfunction b/data/incendium/functions/border_of_life/tree/480_483.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/480_487.mcfunction b/data/incendium/functions/border_of_life/tree/480_487.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/480_495.mcfunction b/data/incendium/functions/border_of_life/tree/480_495.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/480_511.mcfunction b/data/incendium/functions/border_of_life/tree/480_511.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/482_483.mcfunction b/data/incendium/functions/border_of_life/tree/482_483.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/484_485.mcfunction b/data/incendium/functions/border_of_life/tree/484_485.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/484_487.mcfunction b/data/incendium/functions/border_of_life/tree/484_487.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/486_487.mcfunction b/data/incendium/functions/border_of_life/tree/486_487.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/488_489.mcfunction b/data/incendium/functions/border_of_life/tree/488_489.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/488_491.mcfunction b/data/incendium/functions/border_of_life/tree/488_491.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/488_495.mcfunction b/data/incendium/functions/border_of_life/tree/488_495.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/48_49.mcfunction b/data/incendium/functions/border_of_life/tree/48_49.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/48_51.mcfunction b/data/incendium/functions/border_of_life/tree/48_51.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/48_55.mcfunction b/data/incendium/functions/border_of_life/tree/48_55.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/48_63.mcfunction b/data/incendium/functions/border_of_life/tree/48_63.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/490_491.mcfunction b/data/incendium/functions/border_of_life/tree/490_491.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/492_493.mcfunction b/data/incendium/functions/border_of_life/tree/492_493.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/492_495.mcfunction b/data/incendium/functions/border_of_life/tree/492_495.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/494_495.mcfunction b/data/incendium/functions/border_of_life/tree/494_495.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/496_497.mcfunction b/data/incendium/functions/border_of_life/tree/496_497.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/496_499.mcfunction b/data/incendium/functions/border_of_life/tree/496_499.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/496_503.mcfunction b/data/incendium/functions/border_of_life/tree/496_503.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/496_511.mcfunction b/data/incendium/functions/border_of_life/tree/496_511.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/498_499.mcfunction b/data/incendium/functions/border_of_life/tree/498_499.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/4_5.mcfunction b/data/incendium/functions/border_of_life/tree/4_5.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/4_7.mcfunction b/data/incendium/functions/border_of_life/tree/4_7.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/500_501.mcfunction b/data/incendium/functions/border_of_life/tree/500_501.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/500_503.mcfunction b/data/incendium/functions/border_of_life/tree/500_503.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/502_503.mcfunction b/data/incendium/functions/border_of_life/tree/502_503.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/504_505.mcfunction b/data/incendium/functions/border_of_life/tree/504_505.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/504_507.mcfunction b/data/incendium/functions/border_of_life/tree/504_507.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/504_511.mcfunction b/data/incendium/functions/border_of_life/tree/504_511.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/506_507.mcfunction b/data/incendium/functions/border_of_life/tree/506_507.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/508_509.mcfunction b/data/incendium/functions/border_of_life/tree/508_509.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/508_511.mcfunction b/data/incendium/functions/border_of_life/tree/508_511.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/50_51.mcfunction b/data/incendium/functions/border_of_life/tree/50_51.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/510_511.mcfunction b/data/incendium/functions/border_of_life/tree/510_511.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/512_1023.mcfunction b/data/incendium/functions/border_of_life/tree/512_1023.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/512_513.mcfunction b/data/incendium/functions/border_of_life/tree/512_513.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/512_515.mcfunction b/data/incendium/functions/border_of_life/tree/512_515.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/512_519.mcfunction b/data/incendium/functions/border_of_life/tree/512_519.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/512_527.mcfunction b/data/incendium/functions/border_of_life/tree/512_527.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/512_543.mcfunction b/data/incendium/functions/border_of_life/tree/512_543.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/512_575.mcfunction b/data/incendium/functions/border_of_life/tree/512_575.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/512_639.mcfunction b/data/incendium/functions/border_of_life/tree/512_639.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/512_767.mcfunction b/data/incendium/functions/border_of_life/tree/512_767.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/514_515.mcfunction b/data/incendium/functions/border_of_life/tree/514_515.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/516_517.mcfunction b/data/incendium/functions/border_of_life/tree/516_517.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/516_519.mcfunction b/data/incendium/functions/border_of_life/tree/516_519.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/518_519.mcfunction b/data/incendium/functions/border_of_life/tree/518_519.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/520_521.mcfunction b/data/incendium/functions/border_of_life/tree/520_521.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/520_523.mcfunction b/data/incendium/functions/border_of_life/tree/520_523.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/520_527.mcfunction b/data/incendium/functions/border_of_life/tree/520_527.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/522_523.mcfunction b/data/incendium/functions/border_of_life/tree/522_523.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/524_525.mcfunction b/data/incendium/functions/border_of_life/tree/524_525.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/524_527.mcfunction b/data/incendium/functions/border_of_life/tree/524_527.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/526_527.mcfunction b/data/incendium/functions/border_of_life/tree/526_527.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/528_529.mcfunction b/data/incendium/functions/border_of_life/tree/528_529.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/528_531.mcfunction b/data/incendium/functions/border_of_life/tree/528_531.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/528_535.mcfunction b/data/incendium/functions/border_of_life/tree/528_535.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/528_543.mcfunction b/data/incendium/functions/border_of_life/tree/528_543.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/52_53.mcfunction b/data/incendium/functions/border_of_life/tree/52_53.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/52_55.mcfunction b/data/incendium/functions/border_of_life/tree/52_55.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/530_531.mcfunction b/data/incendium/functions/border_of_life/tree/530_531.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/532_533.mcfunction b/data/incendium/functions/border_of_life/tree/532_533.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/532_535.mcfunction b/data/incendium/functions/border_of_life/tree/532_535.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/534_535.mcfunction b/data/incendium/functions/border_of_life/tree/534_535.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/536_537.mcfunction b/data/incendium/functions/border_of_life/tree/536_537.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/536_539.mcfunction b/data/incendium/functions/border_of_life/tree/536_539.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/536_543.mcfunction b/data/incendium/functions/border_of_life/tree/536_543.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/538_539.mcfunction b/data/incendium/functions/border_of_life/tree/538_539.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/540_541.mcfunction b/data/incendium/functions/border_of_life/tree/540_541.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/540_543.mcfunction b/data/incendium/functions/border_of_life/tree/540_543.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/542_543.mcfunction b/data/incendium/functions/border_of_life/tree/542_543.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/544_545.mcfunction b/data/incendium/functions/border_of_life/tree/544_545.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/544_547.mcfunction b/data/incendium/functions/border_of_life/tree/544_547.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/544_551.mcfunction b/data/incendium/functions/border_of_life/tree/544_551.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/544_559.mcfunction b/data/incendium/functions/border_of_life/tree/544_559.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/544_575.mcfunction b/data/incendium/functions/border_of_life/tree/544_575.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/546_547.mcfunction b/data/incendium/functions/border_of_life/tree/546_547.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/548_549.mcfunction b/data/incendium/functions/border_of_life/tree/548_549.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/548_551.mcfunction b/data/incendium/functions/border_of_life/tree/548_551.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/54_55.mcfunction b/data/incendium/functions/border_of_life/tree/54_55.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/550_551.mcfunction b/data/incendium/functions/border_of_life/tree/550_551.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/552_553.mcfunction b/data/incendium/functions/border_of_life/tree/552_553.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/552_555.mcfunction b/data/incendium/functions/border_of_life/tree/552_555.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/552_559.mcfunction b/data/incendium/functions/border_of_life/tree/552_559.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/554_555.mcfunction b/data/incendium/functions/border_of_life/tree/554_555.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/556_557.mcfunction b/data/incendium/functions/border_of_life/tree/556_557.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/556_559.mcfunction b/data/incendium/functions/border_of_life/tree/556_559.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/558_559.mcfunction b/data/incendium/functions/border_of_life/tree/558_559.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/560_561.mcfunction b/data/incendium/functions/border_of_life/tree/560_561.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/560_563.mcfunction b/data/incendium/functions/border_of_life/tree/560_563.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/560_567.mcfunction b/data/incendium/functions/border_of_life/tree/560_567.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/560_575.mcfunction b/data/incendium/functions/border_of_life/tree/560_575.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/562_563.mcfunction b/data/incendium/functions/border_of_life/tree/562_563.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/564_565.mcfunction b/data/incendium/functions/border_of_life/tree/564_565.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/564_567.mcfunction b/data/incendium/functions/border_of_life/tree/564_567.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/566_567.mcfunction b/data/incendium/functions/border_of_life/tree/566_567.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/568_569.mcfunction b/data/incendium/functions/border_of_life/tree/568_569.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/568_571.mcfunction b/data/incendium/functions/border_of_life/tree/568_571.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/568_575.mcfunction b/data/incendium/functions/border_of_life/tree/568_575.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/56_57.mcfunction b/data/incendium/functions/border_of_life/tree/56_57.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/56_59.mcfunction b/data/incendium/functions/border_of_life/tree/56_59.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/56_63.mcfunction b/data/incendium/functions/border_of_life/tree/56_63.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/570_571.mcfunction b/data/incendium/functions/border_of_life/tree/570_571.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/572_573.mcfunction b/data/incendium/functions/border_of_life/tree/572_573.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/572_575.mcfunction b/data/incendium/functions/border_of_life/tree/572_575.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/574_575.mcfunction b/data/incendium/functions/border_of_life/tree/574_575.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/576_577.mcfunction b/data/incendium/functions/border_of_life/tree/576_577.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/576_579.mcfunction b/data/incendium/functions/border_of_life/tree/576_579.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/576_583.mcfunction b/data/incendium/functions/border_of_life/tree/576_583.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/576_591.mcfunction b/data/incendium/functions/border_of_life/tree/576_591.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/576_607.mcfunction b/data/incendium/functions/border_of_life/tree/576_607.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/576_639.mcfunction b/data/incendium/functions/border_of_life/tree/576_639.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/578_579.mcfunction b/data/incendium/functions/border_of_life/tree/578_579.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/580_581.mcfunction b/data/incendium/functions/border_of_life/tree/580_581.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/580_583.mcfunction b/data/incendium/functions/border_of_life/tree/580_583.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/582_583.mcfunction b/data/incendium/functions/border_of_life/tree/582_583.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/584_585.mcfunction b/data/incendium/functions/border_of_life/tree/584_585.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/584_587.mcfunction b/data/incendium/functions/border_of_life/tree/584_587.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/584_591.mcfunction b/data/incendium/functions/border_of_life/tree/584_591.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/586_587.mcfunction b/data/incendium/functions/border_of_life/tree/586_587.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/588_589.mcfunction b/data/incendium/functions/border_of_life/tree/588_589.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/588_591.mcfunction b/data/incendium/functions/border_of_life/tree/588_591.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/58_59.mcfunction b/data/incendium/functions/border_of_life/tree/58_59.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/590_591.mcfunction b/data/incendium/functions/border_of_life/tree/590_591.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/592_593.mcfunction b/data/incendium/functions/border_of_life/tree/592_593.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/592_595.mcfunction b/data/incendium/functions/border_of_life/tree/592_595.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/592_599.mcfunction b/data/incendium/functions/border_of_life/tree/592_599.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/592_607.mcfunction b/data/incendium/functions/border_of_life/tree/592_607.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/594_595.mcfunction b/data/incendium/functions/border_of_life/tree/594_595.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/596_597.mcfunction b/data/incendium/functions/border_of_life/tree/596_597.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/596_599.mcfunction b/data/incendium/functions/border_of_life/tree/596_599.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/598_599.mcfunction b/data/incendium/functions/border_of_life/tree/598_599.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/600_601.mcfunction b/data/incendium/functions/border_of_life/tree/600_601.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/600_603.mcfunction b/data/incendium/functions/border_of_life/tree/600_603.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/600_607.mcfunction b/data/incendium/functions/border_of_life/tree/600_607.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/602_603.mcfunction b/data/incendium/functions/border_of_life/tree/602_603.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/604_605.mcfunction b/data/incendium/functions/border_of_life/tree/604_605.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/604_607.mcfunction b/data/incendium/functions/border_of_life/tree/604_607.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/606_607.mcfunction b/data/incendium/functions/border_of_life/tree/606_607.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/608_609.mcfunction b/data/incendium/functions/border_of_life/tree/608_609.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/608_611.mcfunction b/data/incendium/functions/border_of_life/tree/608_611.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/608_615.mcfunction b/data/incendium/functions/border_of_life/tree/608_615.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/608_623.mcfunction b/data/incendium/functions/border_of_life/tree/608_623.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/608_639.mcfunction b/data/incendium/functions/border_of_life/tree/608_639.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/60_61.mcfunction b/data/incendium/functions/border_of_life/tree/60_61.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/60_63.mcfunction b/data/incendium/functions/border_of_life/tree/60_63.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/610_611.mcfunction b/data/incendium/functions/border_of_life/tree/610_611.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/612_613.mcfunction b/data/incendium/functions/border_of_life/tree/612_613.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/612_615.mcfunction b/data/incendium/functions/border_of_life/tree/612_615.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/614_615.mcfunction b/data/incendium/functions/border_of_life/tree/614_615.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/616_617.mcfunction b/data/incendium/functions/border_of_life/tree/616_617.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/616_619.mcfunction b/data/incendium/functions/border_of_life/tree/616_619.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/616_623.mcfunction b/data/incendium/functions/border_of_life/tree/616_623.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/618_619.mcfunction b/data/incendium/functions/border_of_life/tree/618_619.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/620_621.mcfunction b/data/incendium/functions/border_of_life/tree/620_621.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/620_623.mcfunction b/data/incendium/functions/border_of_life/tree/620_623.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/622_623.mcfunction b/data/incendium/functions/border_of_life/tree/622_623.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/624_625.mcfunction b/data/incendium/functions/border_of_life/tree/624_625.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/624_627.mcfunction b/data/incendium/functions/border_of_life/tree/624_627.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/624_631.mcfunction b/data/incendium/functions/border_of_life/tree/624_631.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/624_639.mcfunction b/data/incendium/functions/border_of_life/tree/624_639.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/626_627.mcfunction b/data/incendium/functions/border_of_life/tree/626_627.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/628_629.mcfunction b/data/incendium/functions/border_of_life/tree/628_629.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/628_631.mcfunction b/data/incendium/functions/border_of_life/tree/628_631.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/62_63.mcfunction b/data/incendium/functions/border_of_life/tree/62_63.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/630_631.mcfunction b/data/incendium/functions/border_of_life/tree/630_631.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/632_633.mcfunction b/data/incendium/functions/border_of_life/tree/632_633.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/632_635.mcfunction b/data/incendium/functions/border_of_life/tree/632_635.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/632_639.mcfunction b/data/incendium/functions/border_of_life/tree/632_639.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/634_635.mcfunction b/data/incendium/functions/border_of_life/tree/634_635.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/636_637.mcfunction b/data/incendium/functions/border_of_life/tree/636_637.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/636_639.mcfunction b/data/incendium/functions/border_of_life/tree/636_639.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/638_639.mcfunction b/data/incendium/functions/border_of_life/tree/638_639.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/640_641.mcfunction b/data/incendium/functions/border_of_life/tree/640_641.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/640_643.mcfunction b/data/incendium/functions/border_of_life/tree/640_643.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/640_647.mcfunction b/data/incendium/functions/border_of_life/tree/640_647.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/640_655.mcfunction b/data/incendium/functions/border_of_life/tree/640_655.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/640_671.mcfunction b/data/incendium/functions/border_of_life/tree/640_671.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/640_703.mcfunction b/data/incendium/functions/border_of_life/tree/640_703.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/640_767.mcfunction b/data/incendium/functions/border_of_life/tree/640_767.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/642_643.mcfunction b/data/incendium/functions/border_of_life/tree/642_643.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/644_645.mcfunction b/data/incendium/functions/border_of_life/tree/644_645.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/644_647.mcfunction b/data/incendium/functions/border_of_life/tree/644_647.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/646_647.mcfunction b/data/incendium/functions/border_of_life/tree/646_647.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/648_649.mcfunction b/data/incendium/functions/border_of_life/tree/648_649.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/648_651.mcfunction b/data/incendium/functions/border_of_life/tree/648_651.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/648_655.mcfunction b/data/incendium/functions/border_of_life/tree/648_655.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/64_127.mcfunction b/data/incendium/functions/border_of_life/tree/64_127.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/64_65.mcfunction b/data/incendium/functions/border_of_life/tree/64_65.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/64_67.mcfunction b/data/incendium/functions/border_of_life/tree/64_67.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/64_71.mcfunction b/data/incendium/functions/border_of_life/tree/64_71.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/64_79.mcfunction b/data/incendium/functions/border_of_life/tree/64_79.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/64_95.mcfunction b/data/incendium/functions/border_of_life/tree/64_95.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/650_651.mcfunction b/data/incendium/functions/border_of_life/tree/650_651.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/652_653.mcfunction b/data/incendium/functions/border_of_life/tree/652_653.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/652_655.mcfunction b/data/incendium/functions/border_of_life/tree/652_655.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/654_655.mcfunction b/data/incendium/functions/border_of_life/tree/654_655.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/656_657.mcfunction b/data/incendium/functions/border_of_life/tree/656_657.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/656_659.mcfunction b/data/incendium/functions/border_of_life/tree/656_659.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/656_663.mcfunction b/data/incendium/functions/border_of_life/tree/656_663.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/656_671.mcfunction b/data/incendium/functions/border_of_life/tree/656_671.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/658_659.mcfunction b/data/incendium/functions/border_of_life/tree/658_659.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/660_661.mcfunction b/data/incendium/functions/border_of_life/tree/660_661.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/660_663.mcfunction b/data/incendium/functions/border_of_life/tree/660_663.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/662_663.mcfunction b/data/incendium/functions/border_of_life/tree/662_663.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/664_665.mcfunction b/data/incendium/functions/border_of_life/tree/664_665.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/664_667.mcfunction b/data/incendium/functions/border_of_life/tree/664_667.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/664_671.mcfunction b/data/incendium/functions/border_of_life/tree/664_671.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/666_667.mcfunction b/data/incendium/functions/border_of_life/tree/666_667.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/668_669.mcfunction b/data/incendium/functions/border_of_life/tree/668_669.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/668_671.mcfunction b/data/incendium/functions/border_of_life/tree/668_671.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/66_67.mcfunction b/data/incendium/functions/border_of_life/tree/66_67.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/670_671.mcfunction b/data/incendium/functions/border_of_life/tree/670_671.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/672_673.mcfunction b/data/incendium/functions/border_of_life/tree/672_673.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/672_675.mcfunction b/data/incendium/functions/border_of_life/tree/672_675.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/672_679.mcfunction b/data/incendium/functions/border_of_life/tree/672_679.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/672_687.mcfunction b/data/incendium/functions/border_of_life/tree/672_687.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/672_703.mcfunction b/data/incendium/functions/border_of_life/tree/672_703.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/674_675.mcfunction b/data/incendium/functions/border_of_life/tree/674_675.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/676_677.mcfunction b/data/incendium/functions/border_of_life/tree/676_677.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/676_679.mcfunction b/data/incendium/functions/border_of_life/tree/676_679.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/678_679.mcfunction b/data/incendium/functions/border_of_life/tree/678_679.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/680_681.mcfunction b/data/incendium/functions/border_of_life/tree/680_681.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/680_683.mcfunction b/data/incendium/functions/border_of_life/tree/680_683.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/680_687.mcfunction b/data/incendium/functions/border_of_life/tree/680_687.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/682_683.mcfunction b/data/incendium/functions/border_of_life/tree/682_683.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/684_685.mcfunction b/data/incendium/functions/border_of_life/tree/684_685.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/684_687.mcfunction b/data/incendium/functions/border_of_life/tree/684_687.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/686_687.mcfunction b/data/incendium/functions/border_of_life/tree/686_687.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/688_689.mcfunction b/data/incendium/functions/border_of_life/tree/688_689.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/688_691.mcfunction b/data/incendium/functions/border_of_life/tree/688_691.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/688_695.mcfunction b/data/incendium/functions/border_of_life/tree/688_695.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/688_703.mcfunction b/data/incendium/functions/border_of_life/tree/688_703.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/68_69.mcfunction b/data/incendium/functions/border_of_life/tree/68_69.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/68_71.mcfunction b/data/incendium/functions/border_of_life/tree/68_71.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/690_691.mcfunction b/data/incendium/functions/border_of_life/tree/690_691.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/692_693.mcfunction b/data/incendium/functions/border_of_life/tree/692_693.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/692_695.mcfunction b/data/incendium/functions/border_of_life/tree/692_695.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/694_695.mcfunction b/data/incendium/functions/border_of_life/tree/694_695.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/696_697.mcfunction b/data/incendium/functions/border_of_life/tree/696_697.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/696_699.mcfunction b/data/incendium/functions/border_of_life/tree/696_699.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/696_703.mcfunction b/data/incendium/functions/border_of_life/tree/696_703.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/698_699.mcfunction b/data/incendium/functions/border_of_life/tree/698_699.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/6_7.mcfunction b/data/incendium/functions/border_of_life/tree/6_7.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/700_701.mcfunction b/data/incendium/functions/border_of_life/tree/700_701.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/700_703.mcfunction b/data/incendium/functions/border_of_life/tree/700_703.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/702_703.mcfunction b/data/incendium/functions/border_of_life/tree/702_703.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/704_705.mcfunction b/data/incendium/functions/border_of_life/tree/704_705.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/704_707.mcfunction b/data/incendium/functions/border_of_life/tree/704_707.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/704_711.mcfunction b/data/incendium/functions/border_of_life/tree/704_711.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/704_719.mcfunction b/data/incendium/functions/border_of_life/tree/704_719.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/704_735.mcfunction b/data/incendium/functions/border_of_life/tree/704_735.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/704_767.mcfunction b/data/incendium/functions/border_of_life/tree/704_767.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/706_707.mcfunction b/data/incendium/functions/border_of_life/tree/706_707.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/708_709.mcfunction b/data/incendium/functions/border_of_life/tree/708_709.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/708_711.mcfunction b/data/incendium/functions/border_of_life/tree/708_711.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/70_71.mcfunction b/data/incendium/functions/border_of_life/tree/70_71.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/710_711.mcfunction b/data/incendium/functions/border_of_life/tree/710_711.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/712_713.mcfunction b/data/incendium/functions/border_of_life/tree/712_713.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/712_715.mcfunction b/data/incendium/functions/border_of_life/tree/712_715.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/712_719.mcfunction b/data/incendium/functions/border_of_life/tree/712_719.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/714_715.mcfunction b/data/incendium/functions/border_of_life/tree/714_715.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/716_717.mcfunction b/data/incendium/functions/border_of_life/tree/716_717.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/716_719.mcfunction b/data/incendium/functions/border_of_life/tree/716_719.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/718_719.mcfunction b/data/incendium/functions/border_of_life/tree/718_719.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/720_721.mcfunction b/data/incendium/functions/border_of_life/tree/720_721.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/720_723.mcfunction b/data/incendium/functions/border_of_life/tree/720_723.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/720_727.mcfunction b/data/incendium/functions/border_of_life/tree/720_727.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/720_735.mcfunction b/data/incendium/functions/border_of_life/tree/720_735.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/722_723.mcfunction b/data/incendium/functions/border_of_life/tree/722_723.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/724_725.mcfunction b/data/incendium/functions/border_of_life/tree/724_725.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/724_727.mcfunction b/data/incendium/functions/border_of_life/tree/724_727.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/726_727.mcfunction b/data/incendium/functions/border_of_life/tree/726_727.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/728_729.mcfunction b/data/incendium/functions/border_of_life/tree/728_729.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/728_731.mcfunction b/data/incendium/functions/border_of_life/tree/728_731.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/728_735.mcfunction b/data/incendium/functions/border_of_life/tree/728_735.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/72_73.mcfunction b/data/incendium/functions/border_of_life/tree/72_73.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/72_75.mcfunction b/data/incendium/functions/border_of_life/tree/72_75.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/72_79.mcfunction b/data/incendium/functions/border_of_life/tree/72_79.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/730_731.mcfunction b/data/incendium/functions/border_of_life/tree/730_731.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/732_733.mcfunction b/data/incendium/functions/border_of_life/tree/732_733.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/732_735.mcfunction b/data/incendium/functions/border_of_life/tree/732_735.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/734_735.mcfunction b/data/incendium/functions/border_of_life/tree/734_735.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/736_737.mcfunction b/data/incendium/functions/border_of_life/tree/736_737.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/736_739.mcfunction b/data/incendium/functions/border_of_life/tree/736_739.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/736_743.mcfunction b/data/incendium/functions/border_of_life/tree/736_743.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/736_751.mcfunction b/data/incendium/functions/border_of_life/tree/736_751.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/736_767.mcfunction b/data/incendium/functions/border_of_life/tree/736_767.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/738_739.mcfunction b/data/incendium/functions/border_of_life/tree/738_739.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/740_741.mcfunction b/data/incendium/functions/border_of_life/tree/740_741.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/740_743.mcfunction b/data/incendium/functions/border_of_life/tree/740_743.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/742_743.mcfunction b/data/incendium/functions/border_of_life/tree/742_743.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/744_745.mcfunction b/data/incendium/functions/border_of_life/tree/744_745.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/744_747.mcfunction b/data/incendium/functions/border_of_life/tree/744_747.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/744_751.mcfunction b/data/incendium/functions/border_of_life/tree/744_751.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/746_747.mcfunction b/data/incendium/functions/border_of_life/tree/746_747.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/748_749.mcfunction b/data/incendium/functions/border_of_life/tree/748_749.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/748_751.mcfunction b/data/incendium/functions/border_of_life/tree/748_751.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/74_75.mcfunction b/data/incendium/functions/border_of_life/tree/74_75.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/750_751.mcfunction b/data/incendium/functions/border_of_life/tree/750_751.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/752_753.mcfunction b/data/incendium/functions/border_of_life/tree/752_753.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/752_755.mcfunction b/data/incendium/functions/border_of_life/tree/752_755.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/752_759.mcfunction b/data/incendium/functions/border_of_life/tree/752_759.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/752_767.mcfunction b/data/incendium/functions/border_of_life/tree/752_767.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/754_755.mcfunction b/data/incendium/functions/border_of_life/tree/754_755.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/756_757.mcfunction b/data/incendium/functions/border_of_life/tree/756_757.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/756_759.mcfunction b/data/incendium/functions/border_of_life/tree/756_759.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/758_759.mcfunction b/data/incendium/functions/border_of_life/tree/758_759.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/760_761.mcfunction b/data/incendium/functions/border_of_life/tree/760_761.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/760_763.mcfunction b/data/incendium/functions/border_of_life/tree/760_763.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/760_767.mcfunction b/data/incendium/functions/border_of_life/tree/760_767.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/762_763.mcfunction b/data/incendium/functions/border_of_life/tree/762_763.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/764_765.mcfunction b/data/incendium/functions/border_of_life/tree/764_765.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/764_767.mcfunction b/data/incendium/functions/border_of_life/tree/764_767.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/766_767.mcfunction b/data/incendium/functions/border_of_life/tree/766_767.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/768_1023.mcfunction b/data/incendium/functions/border_of_life/tree/768_1023.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/768_769.mcfunction b/data/incendium/functions/border_of_life/tree/768_769.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/768_771.mcfunction b/data/incendium/functions/border_of_life/tree/768_771.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/768_775.mcfunction b/data/incendium/functions/border_of_life/tree/768_775.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/768_783.mcfunction b/data/incendium/functions/border_of_life/tree/768_783.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/768_799.mcfunction b/data/incendium/functions/border_of_life/tree/768_799.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/768_831.mcfunction b/data/incendium/functions/border_of_life/tree/768_831.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/768_895.mcfunction b/data/incendium/functions/border_of_life/tree/768_895.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/76_77.mcfunction b/data/incendium/functions/border_of_life/tree/76_77.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/76_79.mcfunction b/data/incendium/functions/border_of_life/tree/76_79.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/770_771.mcfunction b/data/incendium/functions/border_of_life/tree/770_771.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/772_773.mcfunction b/data/incendium/functions/border_of_life/tree/772_773.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/772_775.mcfunction b/data/incendium/functions/border_of_life/tree/772_775.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/774_775.mcfunction b/data/incendium/functions/border_of_life/tree/774_775.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/776_777.mcfunction b/data/incendium/functions/border_of_life/tree/776_777.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/776_779.mcfunction b/data/incendium/functions/border_of_life/tree/776_779.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/776_783.mcfunction b/data/incendium/functions/border_of_life/tree/776_783.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/778_779.mcfunction b/data/incendium/functions/border_of_life/tree/778_779.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/780_781.mcfunction b/data/incendium/functions/border_of_life/tree/780_781.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/780_783.mcfunction b/data/incendium/functions/border_of_life/tree/780_783.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/782_783.mcfunction b/data/incendium/functions/border_of_life/tree/782_783.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/784_785.mcfunction b/data/incendium/functions/border_of_life/tree/784_785.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/784_787.mcfunction b/data/incendium/functions/border_of_life/tree/784_787.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/784_791.mcfunction b/data/incendium/functions/border_of_life/tree/784_791.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/784_799.mcfunction b/data/incendium/functions/border_of_life/tree/784_799.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/786_787.mcfunction b/data/incendium/functions/border_of_life/tree/786_787.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/788_789.mcfunction b/data/incendium/functions/border_of_life/tree/788_789.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/788_791.mcfunction b/data/incendium/functions/border_of_life/tree/788_791.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/78_79.mcfunction b/data/incendium/functions/border_of_life/tree/78_79.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/790_791.mcfunction b/data/incendium/functions/border_of_life/tree/790_791.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/792_793.mcfunction b/data/incendium/functions/border_of_life/tree/792_793.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/792_795.mcfunction b/data/incendium/functions/border_of_life/tree/792_795.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/792_799.mcfunction b/data/incendium/functions/border_of_life/tree/792_799.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/794_795.mcfunction b/data/incendium/functions/border_of_life/tree/794_795.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/796_797.mcfunction b/data/incendium/functions/border_of_life/tree/796_797.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/796_799.mcfunction b/data/incendium/functions/border_of_life/tree/796_799.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/798_799.mcfunction b/data/incendium/functions/border_of_life/tree/798_799.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/800_801.mcfunction b/data/incendium/functions/border_of_life/tree/800_801.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/800_803.mcfunction b/data/incendium/functions/border_of_life/tree/800_803.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/800_807.mcfunction b/data/incendium/functions/border_of_life/tree/800_807.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/800_815.mcfunction b/data/incendium/functions/border_of_life/tree/800_815.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/800_831.mcfunction b/data/incendium/functions/border_of_life/tree/800_831.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/802_803.mcfunction b/data/incendium/functions/border_of_life/tree/802_803.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/804_805.mcfunction b/data/incendium/functions/border_of_life/tree/804_805.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/804_807.mcfunction b/data/incendium/functions/border_of_life/tree/804_807.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/806_807.mcfunction b/data/incendium/functions/border_of_life/tree/806_807.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/808_809.mcfunction b/data/incendium/functions/border_of_life/tree/808_809.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/808_811.mcfunction b/data/incendium/functions/border_of_life/tree/808_811.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/808_815.mcfunction b/data/incendium/functions/border_of_life/tree/808_815.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/80_81.mcfunction b/data/incendium/functions/border_of_life/tree/80_81.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/80_83.mcfunction b/data/incendium/functions/border_of_life/tree/80_83.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/80_87.mcfunction b/data/incendium/functions/border_of_life/tree/80_87.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/80_95.mcfunction b/data/incendium/functions/border_of_life/tree/80_95.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/810_811.mcfunction b/data/incendium/functions/border_of_life/tree/810_811.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/812_813.mcfunction b/data/incendium/functions/border_of_life/tree/812_813.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/812_815.mcfunction b/data/incendium/functions/border_of_life/tree/812_815.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/814_815.mcfunction b/data/incendium/functions/border_of_life/tree/814_815.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/816_817.mcfunction b/data/incendium/functions/border_of_life/tree/816_817.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/816_819.mcfunction b/data/incendium/functions/border_of_life/tree/816_819.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/816_823.mcfunction b/data/incendium/functions/border_of_life/tree/816_823.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/816_831.mcfunction b/data/incendium/functions/border_of_life/tree/816_831.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/818_819.mcfunction b/data/incendium/functions/border_of_life/tree/818_819.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/820_821.mcfunction b/data/incendium/functions/border_of_life/tree/820_821.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/820_823.mcfunction b/data/incendium/functions/border_of_life/tree/820_823.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/822_823.mcfunction b/data/incendium/functions/border_of_life/tree/822_823.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/824_825.mcfunction b/data/incendium/functions/border_of_life/tree/824_825.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/824_827.mcfunction b/data/incendium/functions/border_of_life/tree/824_827.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/824_831.mcfunction b/data/incendium/functions/border_of_life/tree/824_831.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/826_827.mcfunction b/data/incendium/functions/border_of_life/tree/826_827.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/828_829.mcfunction b/data/incendium/functions/border_of_life/tree/828_829.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/828_831.mcfunction b/data/incendium/functions/border_of_life/tree/828_831.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/82_83.mcfunction b/data/incendium/functions/border_of_life/tree/82_83.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/830_831.mcfunction b/data/incendium/functions/border_of_life/tree/830_831.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/832_833.mcfunction b/data/incendium/functions/border_of_life/tree/832_833.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/832_835.mcfunction b/data/incendium/functions/border_of_life/tree/832_835.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/832_839.mcfunction b/data/incendium/functions/border_of_life/tree/832_839.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/832_847.mcfunction b/data/incendium/functions/border_of_life/tree/832_847.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/832_863.mcfunction b/data/incendium/functions/border_of_life/tree/832_863.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/832_895.mcfunction b/data/incendium/functions/border_of_life/tree/832_895.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/834_835.mcfunction b/data/incendium/functions/border_of_life/tree/834_835.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/836_837.mcfunction b/data/incendium/functions/border_of_life/tree/836_837.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/836_839.mcfunction b/data/incendium/functions/border_of_life/tree/836_839.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/838_839.mcfunction b/data/incendium/functions/border_of_life/tree/838_839.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/840_841.mcfunction b/data/incendium/functions/border_of_life/tree/840_841.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/840_843.mcfunction b/data/incendium/functions/border_of_life/tree/840_843.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/840_847.mcfunction b/data/incendium/functions/border_of_life/tree/840_847.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/842_843.mcfunction b/data/incendium/functions/border_of_life/tree/842_843.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/844_845.mcfunction b/data/incendium/functions/border_of_life/tree/844_845.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/844_847.mcfunction b/data/incendium/functions/border_of_life/tree/844_847.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/846_847.mcfunction b/data/incendium/functions/border_of_life/tree/846_847.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/848_849.mcfunction b/data/incendium/functions/border_of_life/tree/848_849.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/848_851.mcfunction b/data/incendium/functions/border_of_life/tree/848_851.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/848_855.mcfunction b/data/incendium/functions/border_of_life/tree/848_855.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/848_863.mcfunction b/data/incendium/functions/border_of_life/tree/848_863.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/84_85.mcfunction b/data/incendium/functions/border_of_life/tree/84_85.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/84_87.mcfunction b/data/incendium/functions/border_of_life/tree/84_87.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/850_851.mcfunction b/data/incendium/functions/border_of_life/tree/850_851.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/852_853.mcfunction b/data/incendium/functions/border_of_life/tree/852_853.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/852_855.mcfunction b/data/incendium/functions/border_of_life/tree/852_855.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/854_855.mcfunction b/data/incendium/functions/border_of_life/tree/854_855.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/856_857.mcfunction b/data/incendium/functions/border_of_life/tree/856_857.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/856_859.mcfunction b/data/incendium/functions/border_of_life/tree/856_859.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/856_863.mcfunction b/data/incendium/functions/border_of_life/tree/856_863.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/858_859.mcfunction b/data/incendium/functions/border_of_life/tree/858_859.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/860_861.mcfunction b/data/incendium/functions/border_of_life/tree/860_861.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/860_863.mcfunction b/data/incendium/functions/border_of_life/tree/860_863.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/862_863.mcfunction b/data/incendium/functions/border_of_life/tree/862_863.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/864_865.mcfunction b/data/incendium/functions/border_of_life/tree/864_865.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/864_867.mcfunction b/data/incendium/functions/border_of_life/tree/864_867.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/864_871.mcfunction b/data/incendium/functions/border_of_life/tree/864_871.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/864_879.mcfunction b/data/incendium/functions/border_of_life/tree/864_879.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/864_895.mcfunction b/data/incendium/functions/border_of_life/tree/864_895.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/866_867.mcfunction b/data/incendium/functions/border_of_life/tree/866_867.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/868_869.mcfunction b/data/incendium/functions/border_of_life/tree/868_869.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/868_871.mcfunction b/data/incendium/functions/border_of_life/tree/868_871.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/86_87.mcfunction b/data/incendium/functions/border_of_life/tree/86_87.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/870_871.mcfunction b/data/incendium/functions/border_of_life/tree/870_871.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/872_873.mcfunction b/data/incendium/functions/border_of_life/tree/872_873.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/872_875.mcfunction b/data/incendium/functions/border_of_life/tree/872_875.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/872_879.mcfunction b/data/incendium/functions/border_of_life/tree/872_879.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/874_875.mcfunction b/data/incendium/functions/border_of_life/tree/874_875.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/876_877.mcfunction b/data/incendium/functions/border_of_life/tree/876_877.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/876_879.mcfunction b/data/incendium/functions/border_of_life/tree/876_879.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/878_879.mcfunction b/data/incendium/functions/border_of_life/tree/878_879.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/880_881.mcfunction b/data/incendium/functions/border_of_life/tree/880_881.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/880_883.mcfunction b/data/incendium/functions/border_of_life/tree/880_883.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/880_887.mcfunction b/data/incendium/functions/border_of_life/tree/880_887.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/880_895.mcfunction b/data/incendium/functions/border_of_life/tree/880_895.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/882_883.mcfunction b/data/incendium/functions/border_of_life/tree/882_883.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/884_885.mcfunction b/data/incendium/functions/border_of_life/tree/884_885.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/884_887.mcfunction b/data/incendium/functions/border_of_life/tree/884_887.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/886_887.mcfunction b/data/incendium/functions/border_of_life/tree/886_887.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/888_889.mcfunction b/data/incendium/functions/border_of_life/tree/888_889.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/888_891.mcfunction b/data/incendium/functions/border_of_life/tree/888_891.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/888_895.mcfunction b/data/incendium/functions/border_of_life/tree/888_895.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/88_89.mcfunction b/data/incendium/functions/border_of_life/tree/88_89.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/88_91.mcfunction b/data/incendium/functions/border_of_life/tree/88_91.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/88_95.mcfunction b/data/incendium/functions/border_of_life/tree/88_95.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/890_891.mcfunction b/data/incendium/functions/border_of_life/tree/890_891.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/892_893.mcfunction b/data/incendium/functions/border_of_life/tree/892_893.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/892_895.mcfunction b/data/incendium/functions/border_of_life/tree/892_895.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/894_895.mcfunction b/data/incendium/functions/border_of_life/tree/894_895.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/8_11.mcfunction b/data/incendium/functions/border_of_life/tree/8_11.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/8_15.mcfunction b/data/incendium/functions/border_of_life/tree/8_15.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/8_9.mcfunction b/data/incendium/functions/border_of_life/tree/8_9.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/90_91.mcfunction b/data/incendium/functions/border_of_life/tree/90_91.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/92_93.mcfunction b/data/incendium/functions/border_of_life/tree/92_93.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/92_95.mcfunction b/data/incendium/functions/border_of_life/tree/92_95.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/94_95.mcfunction b/data/incendium/functions/border_of_life/tree/94_95.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/96_103.mcfunction b/data/incendium/functions/border_of_life/tree/96_103.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/96_111.mcfunction b/data/incendium/functions/border_of_life/tree/96_111.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/96_127.mcfunction b/data/incendium/functions/border_of_life/tree/96_127.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/96_97.mcfunction b/data/incendium/functions/border_of_life/tree/96_97.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/96_99.mcfunction b/data/incendium/functions/border_of_life/tree/96_99.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/tree/98_99.mcfunction b/data/incendium/functions/border_of_life/tree/98_99.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/border_of_life/uninstall.mcfunction b/data/incendium/functions/border_of_life/uninstall.mcfunction old mode 100755 new mode 100644 index 44319ec..4a8c744 --- a/data/incendium/functions/border_of_life/uninstall.mcfunction +++ b/data/incendium/functions/border_of_life/uninstall.mcfunction @@ -2,4 +2,4 @@ tag @e remove nbs_borderofli scoreboard objectives remove nbs_borderofli scoreboard objectives remove nbs_borderofli_t datapack disable "file/border_of_life.zip" -tellraw @s ["",{"text":"[NBS] ","color":"gold","bold":true},{"text":"Data pack ","color":"yellow"},{"text":"border_of_life.zip","color":"gold","underlined":true},{"text":" uninstalled successfully. You may now remove it from your data pack folder.","color":"yellow"}] \ No newline at end of file +tellraw @s ["",{"text":"[NBS] ","color":"gold","bold":true},{"text":"border_of_life.zip","color":"gold","underlined":true}," ",{"translate": "%1$s%4733088$s","with":["has uninstalled successfully. You may now remove it from your datapack folder.",{"translate":"incendium.system.nbs.uninstall"}],"color":"yellow"}] \ No newline at end of file diff --git a/data/incendium/functions/castle/1s.mcfunction b/data/incendium/functions/castle/1s.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/alchemist/action/retreat.mcfunction b/data/incendium/functions/castle/alchemist/action/retreat.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/alchemist/init.mcfunction b/data/incendium/functions/castle/alchemist/init.mcfunction old mode 100755 new mode 100644 index f9bdb8d..0667024 --- a/data/incendium/functions/castle/alchemist/init.mcfunction +++ b/data/incendium/functions/castle/alchemist/init.mcfunction @@ -1,7 +1,7 @@ # from: ../mob/init # @s: alchemist -data modify entity @s CustomName set value '"Piglin Alchemist"' +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Piglin Alchemist",{"translate":"incendium.mob.castle.alchemist.name"}]}' data modify entity @s DeathLootTable set value 'incendium:castle/entity/alchemist' tag @s add in.activate_near diff --git a/data/incendium/functions/castle/alchemist/main.mcfunction b/data/incendium/functions/castle/alchemist/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/alchemist/ray/hit.mcfunction b/data/incendium/functions/castle/alchemist/ray/hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/alchemist/ray/iter.mcfunction b/data/incendium/functions/castle/alchemist/ray/iter.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/alchemist/ray/start.mcfunction b/data/incendium/functions/castle/alchemist/ray/start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/archer/action/disengage.mcfunction b/data/incendium/functions/castle/archer/action/disengage.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/archer/action/load/arrow.mcfunction b/data/incendium/functions/castle/archer/action/load/arrow.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/archer/action/load/firework.mcfunction b/data/incendium/functions/castle/archer/action/load/firework.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/archer/action/retreat.mcfunction b/data/incendium/functions/castle/archer/action/retreat.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/archer/action/shoot/arrow.mcfunction b/data/incendium/functions/castle/archer/action/shoot/arrow.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/archer/action/shoot/arrow_init.mcfunction b/data/incendium/functions/castle/archer/action/shoot/arrow_init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/archer/action/shoot/firework.mcfunction b/data/incendium/functions/castle/archer/action/shoot/firework.mcfunction old mode 100755 new mode 100644 index dc693c6..01e28d9 --- a/data/incendium/functions/castle/archer/action/shoot/firework.mcfunction +++ b/data/incendium/functions/castle/archer/action/shoot/firework.mcfunction @@ -1,7 +1,7 @@ # > action: archer shoots firework # firework manipulation -summon minecraft:firework_rocket ~ ~1 ~ {Tags:["in.castle_firework_init"],Silent:0b,Motion:[0.0,0.0,0.0],ShotAtAngle:1b,LifeTime:50,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Flight:1,Explosions:[{Type:4,Flicker:0,Trail:0,Colors:[I;16777215]},{Type:4,Flicker:0,Trail:0,Colors:[I;13421772]},{Type:4,Flicker:0,Trail:0,Colors:[I;10066329]},{Type:4,Flicker:0,Trail:0,Colors:[I;6710886]},{Type:4,Flicker:0,Trail:0,Colors:[I;3355443]},{Type:4,Flicker:0,Trail:0,Colors:[I;0]}]}}}} +summon minecraft:firework_rocket ~ ~1 ~ {Tags:["in.castle_firework_init"],Silent:0b,Motion:[0.0,0.0,0.0],ShotAtAngle:1b,LifeTime:50,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Flight:1,Explosions:[{Type:4,Flicker:0,Trail:0,Colors:[I;6710886]},{Type:4,Flicker:0,Trail:0,Colors:[I;3355443]},{Type:4,Flicker:0,Trail:0,Colors:[I;0]}]}}}} execute positioned ~ ~1.5 ~ as @e[type=firework_rocket,distance=..1,tag=in.castle_firework_init,limit=1] at @s run function incendium:castle/archer/action/shoot/firework_init diff --git a/data/incendium/functions/castle/archer/action/shoot/firework_init.mcfunction b/data/incendium/functions/castle/archer/action/shoot/firework_init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/archer/action/unload.mcfunction b/data/incendium/functions/castle/archer/action/unload.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/archer/init.mcfunction b/data/incendium/functions/castle/archer/init.mcfunction old mode 100755 new mode 100644 index 5af28ef..4f5d6bf --- a/data/incendium/functions/castle/archer/init.mcfunction +++ b/data/incendium/functions/castle/archer/init.mcfunction @@ -1,6 +1,6 @@ # from: ../mob/init # @s: archer -data modify entity @s CustomName set value '"Piglin Archer"' +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Piglin Archer",{"translate":"incendium.mob.castle.archer.name"}]}' tag @s add in.activate_far diff --git a/data/incendium/functions/castle/archer/main.mcfunction b/data/incendium/functions/castle/archer/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/archer/ray/iter.mcfunction b/data/incendium/functions/castle/archer/ray/iter.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/archer/ray/start.mcfunction b/data/incendium/functions/castle/archer/ray/start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/blacksmith/action/become_knight.mcfunction b/data/incendium/functions/castle/blacksmith/action/become_knight.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/blacksmith/action/throw_tnt.mcfunction b/data/incendium/functions/castle/blacksmith/action/throw_tnt.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/blacksmith/action/tnt_init.mcfunction b/data/incendium/functions/castle/blacksmith/action/tnt_init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/blacksmith/init.mcfunction b/data/incendium/functions/castle/blacksmith/init.mcfunction old mode 100755 new mode 100644 index 1bb37b1..3ce101a --- a/data/incendium/functions/castle/blacksmith/init.mcfunction +++ b/data/incendium/functions/castle/blacksmith/init.mcfunction @@ -1,7 +1,7 @@ # from: ../mob/init # @s: blacksmith -data modify entity @s CustomName set value '"Piglin Blacksmith"' +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Piglin Blacksmith",{"translate":"incendium.mob.castle.blacksmith.name"}]}' attribute @s generic.max_health base set 50 data merge entity @s {Health:50.0f} diff --git a/data/incendium/functions/castle/blacksmith/main.mcfunction b/data/incendium/functions/castle/blacksmith/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/knight/action/disengage.mcfunction b/data/incendium/functions/castle/knight/action/disengage.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/knight/action/equip/pickaxe.mcfunction b/data/incendium/functions/castle/knight/action/equip/pickaxe.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/knight/action/equip/sword.mcfunction b/data/incendium/functions/castle/knight/action/equip/sword.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/knight/action/retreat.mcfunction b/data/incendium/functions/castle/knight/action/retreat.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/knight/action/smash/hit.mcfunction b/data/incendium/functions/castle/knight/action/smash/hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/knight/action/smash/iter.mcfunction b/data/incendium/functions/castle/knight/action/smash/iter.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/knight/action/smash/start.mcfunction b/data/incendium/functions/castle/knight/action/smash/start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/knight/init.mcfunction b/data/incendium/functions/castle/knight/init.mcfunction old mode 100755 new mode 100644 index d538ba5..a20666c --- a/data/incendium/functions/castle/knight/init.mcfunction +++ b/data/incendium/functions/castle/knight/init.mcfunction @@ -1,7 +1,7 @@ # from: ../mob/init # @s: knight -data modify entity @s CustomName set value '"Piglin Knight"' +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Piglin Knight",{"translate":"incendium.mob.castle.knight.name"}]}' execute if entity @s[tag=in.randomize] run function incendium:castle/knight/action/equip/sword diff --git a/data/incendium/functions/castle/knight/main.mcfunction b/data/incendium/functions/castle/knight/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/knight/ray/eyes/iter.mcfunction b/data/incendium/functions/castle/knight/ray/eyes/iter.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/knight/ray/eyes/start.mcfunction b/data/incendium/functions/castle/knight/ray/eyes/start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/knight/ray/feet/iter.mcfunction b/data/incendium/functions/castle/knight/ray/feet/iter.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/knight/ray/feet/start.mcfunction b/data/incendium/functions/castle/knight/ray/feet/start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/main.mcfunction b/data/incendium/functions/castle/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/mob/2t.mcfunction b/data/incendium/functions/castle/mob/2t.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/mob/init.mcfunction b/data/incendium/functions/castle/mob/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/mob/main.mcfunction b/data/incendium/functions/castle/mob/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/paratrooper/action/become_knight.mcfunction b/data/incendium/functions/castle/paratrooper/action/become_knight.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/paratrooper/action/flying.mcfunction b/data/incendium/functions/castle/paratrooper/action/flying.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/paratrooper/action/jumped.mcfunction b/data/incendium/functions/castle/paratrooper/action/jumped.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/paratrooper/action/leap.mcfunction b/data/incendium/functions/castle/paratrooper/action/leap.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/paratrooper/action/leap_silent.mcfunction b/data/incendium/functions/castle/paratrooper/action/leap_silent.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/paratrooper/action/shoot/rocket.mcfunction b/data/incendium/functions/castle/paratrooper/action/shoot/rocket.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/paratrooper/action/shoot/rocket_low.mcfunction b/data/incendium/functions/castle/paratrooper/action/shoot/rocket_low.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/paratrooper/init.mcfunction b/data/incendium/functions/castle/paratrooper/init.mcfunction old mode 100755 new mode 100644 index 687c08b..0339fcc --- a/data/incendium/functions/castle/paratrooper/init.mcfunction +++ b/data/incendium/functions/castle/paratrooper/init.mcfunction @@ -1,7 +1,7 @@ # from: ../mob/init # @s: paratrooper -data modify entity @s CustomName set value '"Piglin Paratrooper"' +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Piglin Paratrooper",{"translate":"incendium.mob.castle.paratrooper.name"}]}' data modify entity @s NoGravity set value 0b data modify entity @s ArmorItems[2].tag.incendium.item set value 'paratrooper_wings' diff --git a/data/incendium/functions/castle/paratrooper/main.mcfunction b/data/incendium/functions/castle/paratrooper/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/paratrooper/ray/iter.mcfunction b/data/incendium/functions/castle/paratrooper/ray/iter.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/paratrooper/ray/start.mcfunction b/data/incendium/functions/castle/paratrooper/ray/start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/pyro/action/firework_burst.mcfunction b/data/incendium/functions/castle/pyro/action/firework_burst.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/pyro/action/firework_burst/init.mcfunction b/data/incendium/functions/castle/pyro/action/firework_burst/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/pyro/action/firework_burst/spawn.mcfunction b/data/incendium/functions/castle/pyro/action/firework_burst/spawn.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/pyro/action/firework_spread.mcfunction b/data/incendium/functions/castle/pyro/action/firework_spread.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/pyro/action/firework_spread/aec_init.mcfunction b/data/incendium/functions/castle/pyro/action/firework_spread/aec_init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/pyro/action/firework_spread/fire.mcfunction b/data/incendium/functions/castle/pyro/action/firework_spread/fire.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/pyro/action/firework_spread/fire_init.mcfunction b/data/incendium/functions/castle/pyro/action/firework_spread/fire_init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/pyro/action/leap.mcfunction b/data/incendium/functions/castle/pyro/action/leap.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/pyro/action/summon_fire.mcfunction b/data/incendium/functions/castle/pyro/action/summon_fire.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/pyro/action/summon_fire/aec_init.mcfunction b/data/incendium/functions/castle/pyro/action/summon_fire/aec_init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/pyro/action/summon_fire/block.mcfunction b/data/incendium/functions/castle/pyro/action/summon_fire/block.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/pyro/action/summon_fire/block_init.mcfunction b/data/incendium/functions/castle/pyro/action/summon_fire/block_init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/pyro/init.mcfunction b/data/incendium/functions/castle/pyro/init.mcfunction old mode 100755 new mode 100644 index 85eb173..4a7368d --- a/data/incendium/functions/castle/pyro/init.mcfunction +++ b/data/incendium/functions/castle/pyro/init.mcfunction @@ -1,7 +1,7 @@ # from: ../mob/init # @s: pyro -data modify entity @s CustomName set value '"Piglin Pyromancer"' +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Piglin Pyromancer",{"translate":"incendium.mob.castle.pyro.name"}]}' data modify entity @s ArmorItems[1].tag.Enchantments append value {id:"minecraft:blast_protection",lvl:3s} data modify entity @s ArmorItems[2].tag.Enchantments append value {id:"minecraft:blast_protection",lvl:3s} diff --git a/data/incendium/functions/castle/pyro/main.mcfunction b/data/incendium/functions/castle/pyro/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/scout/init.mcfunction b/data/incendium/functions/castle/scout/init.mcfunction old mode 100755 new mode 100644 index c1b2162..778d85f --- a/data/incendium/functions/castle/scout/init.mcfunction +++ b/data/incendium/functions/castle/scout/init.mcfunction @@ -1,7 +1,7 @@ # from: castle/init (called once) # @s: entity -data modify entity @s CustomName set value '"Piglin Scout"' +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Piglin Scout",{"translate":"incendium.mob.castle.scout.name"}]}' data modify entity @s DeathLootTable set value 'incendium:castle/entity/scout' tag @s add in.activate_mid diff --git a/data/incendium/functions/castle/utils/action/alert.mcfunction b/data/incendium/functions/castle/utils/action/alert.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/action/leap.mcfunction b/data/incendium/functions/castle/utils/action/leap.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/action/leap_mob.mcfunction b/data/incendium/functions/castle/utils/action/leap_mob.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/action/leap_rev_mob.mcfunction b/data/incendium/functions/castle/utils/action/leap_rev_mob.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/action/leap_reverse.mcfunction b/data/incendium/functions/castle/utils/action/leap_reverse.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/action/leap_towards.mcfunction b/data/incendium/functions/castle/utils/action/leap_towards.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/action/leap_towards_low.mcfunction b/data/incendium/functions/castle/utils/action/leap_towards_low.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/action/retreat.mcfunction b/data/incendium/functions/castle/utils/action/retreat.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/action/retreat/main.mcfunction b/data/incendium/functions/castle/utils/action/retreat/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/action/retreat/pearl.mcfunction b/data/incendium/functions/castle/utils/action/retreat/pearl.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/action/retreat/teleport.mcfunction b/data/incendium/functions/castle/utils/action/retreat/teleport.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/equip/fire_resistance.mcfunction b/data/incendium/functions/castle/utils/equip/fire_resistance.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/equip/firework.mcfunction b/data/incendium/functions/castle/utils/equip/firework.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/equip/flint_and_steel.mcfunction b/data/incendium/functions/castle/utils/equip/flint_and_steel.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/equip/golden_apple.mcfunction b/data/incendium/functions/castle/utils/equip/golden_apple.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/equip/harming.mcfunction b/data/incendium/functions/castle/utils/equip/harming.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/equip/milk.mcfunction b/data/incendium/functions/castle/utils/equip/milk.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/equip/pearl.mcfunction b/data/incendium/functions/castle/utils/equip/pearl.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/equip/poison.mcfunction b/data/incendium/functions/castle/utils/equip/poison.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/equip/regen.mcfunction b/data/incendium/functions/castle/utils/equip/regen.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/equip/slowness.mcfunction b/data/incendium/functions/castle/utils/equip/slowness.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/equip/strong_healing.mcfunction b/data/incendium/functions/castle/utils/equip/strong_healing.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/equip/tnt.mcfunction b/data/incendium/functions/castle/utils/equip/tnt.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/equip/weakness.mcfunction b/data/incendium/functions/castle/utils/equip/weakness.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/ray/iter.mcfunction b/data/incendium/functions/castle/utils/ray/iter.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/ray/start.mcfunction b/data/incendium/functions/castle/utils/ray/start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/throw/far.mcfunction b/data/incendium/functions/castle/utils/throw/far.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/throw/harming.mcfunction b/data/incendium/functions/castle/utils/throw/harming.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/throw/mid.mcfunction b/data/incendium/functions/castle/utils/throw/mid.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/throw/near.mcfunction b/data/incendium/functions/castle/utils/throw/near.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/throw/poison.mcfunction b/data/incendium/functions/castle/utils/throw/poison.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/throw/slowness.mcfunction b/data/incendium/functions/castle/utils/throw/slowness.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/throw/weakness.mcfunction b/data/incendium/functions/castle/utils/throw/weakness.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/use/fire_resistance.mcfunction b/data/incendium/functions/castle/utils/use/fire_resistance.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/use/golden_apple.mcfunction b/data/incendium/functions/castle/utils/use/golden_apple.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/use/milk.mcfunction b/data/incendium/functions/castle/utils/use/milk.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/use/pearl.mcfunction b/data/incendium/functions/castle/utils/use/pearl.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/use/regen.mcfunction b/data/incendium/functions/castle/utils/use/regen.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/castle/utils/use/strong_healing.mcfunction b/data/incendium/functions/castle/utils/use/strong_healing.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/clocks/1m.mcfunction b/data/incendium/functions/clocks/1m.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/clocks/1s.mcfunction b/data/incendium/functions/clocks/1s.mcfunction old mode 100755 new mode 100644 index 336ba37..be39d92 --- a/data/incendium/functions/clocks/1s.mcfunction +++ b/data/incendium/functions/clocks/1s.mcfunction @@ -7,6 +7,7 @@ function incendium:castle/1s execute as @a at @s run function incendium:player/1s execute as @e[type=blaze,tag=in.dune_blaze] at @s run function incendium:entity/dune_blaze/1s +execute as @e[type=blaze,tag=in.sentry] at @s run function incendium:entity/sentry/1s effect give @e[type=piglin,predicate=incendium:biome/toxic_heap] poison 10 1 diff --git a/data/incendium/functions/clocks/2t.mcfunction b/data/incendium/functions/clocks/2t.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/clocks/7s.mcfunction b/data/incendium/functions/clocks/7s.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/clocks/main.mcfunction b/data/incendium/functions/clocks/main.mcfunction old mode 100755 new mode 100644 index 0d9ad8f..593d498 --- a/data/incendium/functions/clocks/main.mcfunction +++ b/data/incendium/functions/clocks/main.mcfunction @@ -19,3 +19,5 @@ execute at @e[type=#incendium:mobs,scores={in.frozen=1..},predicate=incendium:ra execute as @e[type=#incendium:other, tag=!in.checked] at @s run function incendium:entity/other/init execute as @e[type=#incendium:other, tag=in.ticking_entity] at @s run function incendium:entity/other/main + +execute if entity @a[tag=nbs_borderofli] run function incendium:border_of_life/tick \ No newline at end of file diff --git a/data/incendium/functions/entity/baby_ghast/eat.mcfunction b/data/incendium/functions/entity/baby_ghast/eat.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/baby_ghast/feed.mcfunction b/data/incendium/functions/entity/baby_ghast/feed.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/baby_ghast/init.mcfunction b/data/incendium/functions/entity/baby_ghast/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/baby_ghast/main.mcfunction b/data/incendium/functions/entity/baby_ghast/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/dune_blaze/1s.mcfunction b/data/incendium/functions/entity/dune_blaze/1s.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/dune_blaze/blind.mcfunction b/data/incendium/functions/entity/dune_blaze/blind.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/dune_blaze/init.mcfunction b/data/incendium/functions/entity/dune_blaze/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/dune_blaze/main.mcfunction b/data/incendium/functions/entity/dune_blaze/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/dune_blaze/unblind.mcfunction b/data/incendium/functions/entity/dune_blaze/unblind.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/illusionist/init.mcfunction b/data/incendium/functions/entity/illusionist/init.mcfunction deleted file mode 100644 index 479e1bf..0000000 --- a/data/incendium/functions/entity/illusionist/init.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -# from: entity/mobs/init -# @s: illusionist - -loot replace entity @s weapon.offhand loot incendium:artifact/patron/scroll_of_returning -data modify entity @s HandDropChances set value [0.08500000089406967f, 0.50f] diff --git a/data/incendium/functions/entity/misc_init/director.mcfunction b/data/incendium/functions/entity/misc_init/director.mcfunction new file mode 100644 index 0000000..25d5847 --- /dev/null +++ b/data/incendium/functions/entity/misc_init/director.mcfunction @@ -0,0 +1,5 @@ +# from: entity/mobs/init +# @s: withered director + +tag @s add in.checked +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Radiation Director",{"translate":"incendium.mob.reactor.director.name"}]}' \ No newline at end of file diff --git a/data/incendium/functions/entity/misc_init/ghast_sentry.mcfunction b/data/incendium/functions/entity/misc_init/ghast_sentry.mcfunction new file mode 100644 index 0000000..e7f95d0 --- /dev/null +++ b/data/incendium/functions/entity/misc_init/ghast_sentry.mcfunction @@ -0,0 +1,10 @@ +# from: entity/mobs/init +# @s: ghast sentry + +tag @s add in.checked +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Ghast Sentry",{"translate":"incendium.mob.reactor.sentry.name"}]}' +team join in.noname @s + +execute at @s run fill ~3 ~3 ~3 ~-3 ~-3 ~-3 air replace minecraft:basalt +execute at @s run fill ~3 ~3 ~3 ~-3 ~-3 ~-3 air replace minecraft:netherrack +execute at @s run fill ~3 ~3 ~3 ~-3 ~-3 ~-3 air replace minecraft:blackstone \ No newline at end of file diff --git a/data/incendium/functions/entity/misc_init/illusionist.mcfunction b/data/incendium/functions/entity/misc_init/illusionist.mcfunction new file mode 100644 index 0000000..88bd17f --- /dev/null +++ b/data/incendium/functions/entity/misc_init/illusionist.mcfunction @@ -0,0 +1,6 @@ +# from: entity/mobs/init +# @s: illusionist + +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Sanctum Illusionist",{"translate":"incendium.mob.sanctum.illusionist.name"}]}' + +data modify entity @s DeathLootTable set value "incendium:artifact/scroll_drop" \ No newline at end of file diff --git a/data/incendium/functions/entity/misc_init/piglin_civilian.mcfunction b/data/incendium/functions/entity/misc_init/piglin_civilian.mcfunction new file mode 100644 index 0000000..e1aa461 --- /dev/null +++ b/data/incendium/functions/entity/misc_init/piglin_civilian.mcfunction @@ -0,0 +1,16 @@ +# from: entity/mobs/init +# @s: withered scientist + +tag @s add in.checked + +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Piglin Civilian",{"translate":"incendium.mob.village.civilian.name"}]}' +data modify entity @s CannotHunt set value 1b +data modify entity @s ArmorItems set value '[{Count:1b, id:"minecraft:leather_boots", tag:{Damage:0}}, {}, {}, {}]' +data modify entity @s HandItems set value '[{},{}]' +data modify entity @s ArmorDropChances set value '[0,0,0,0]' + +attribute @s generic.armor base set 0 +attribute @s generic.armor_toughness base set 0 +attribute @s generic.attack_damage base set 0 +attribute @s generic.follow_range base set 0 +attribute @s generic.movement_speed base set 0.3499999940395355 \ No newline at end of file diff --git a/data/incendium/functions/entity/misc_init/scientist.mcfunction b/data/incendium/functions/entity/misc_init/scientist.mcfunction new file mode 100644 index 0000000..f050b76 --- /dev/null +++ b/data/incendium/functions/entity/misc_init/scientist.mcfunction @@ -0,0 +1,10 @@ +# from: entity/mobs/init +# @s: withered scientist + +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Withered Scientist",{"translate":"incendium.mob.misc.scientist.name"}]}' + +effect give @s strength 999999 1 true +effect give @s resistance 999999 0 true + +tag @s add in.checked +team join in.noname @s \ No newline at end of file diff --git a/data/incendium/functions/entity/misc_init/skeli_bro.mcfunction b/data/incendium/functions/entity/misc_init/skeli_bro.mcfunction new file mode 100644 index 0000000..6633bfa --- /dev/null +++ b/data/incendium/functions/entity/misc_init/skeli_bro.mcfunction @@ -0,0 +1,5 @@ +# from: entity/mobs/init +# @s: Skeleton Brother + +tag @s add in.checked +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Skeleton Brother",{"translate":"incendium.mob.quartz.brother.name"}]}' \ No newline at end of file diff --git a/data/incendium/functions/entity/misc_init/torte.mcfunction b/data/incendium/functions/entity/misc_init/torte.mcfunction new file mode 100644 index 0000000..5b051c0 --- /dev/null +++ b/data/incendium/functions/entity/misc_init/torte.mcfunction @@ -0,0 +1,10 @@ +# from: entity/mobs/init +# @s: torte + +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Torte",{"translate":"incendium.mob.quartz.torte.name"}],"color":"#8dd2e8"}' + +loot replace entity @s weapon.mainhand loot incendium:artifact/tool/cake_batter +effect give @s strength 999999 2 +data modify entity @s HandDropChances set value [0.50f, 0.50f] + +tag @s add in.chekced \ No newline at end of file diff --git a/data/incendium/functions/entity/withered_skeleton/init.mcfunction b/data/incendium/functions/entity/misc_init/warrior.mcfunction old mode 100755 new mode 100644 similarity index 52% rename from data/incendium/functions/entity/withered_skeleton/init.mcfunction rename to data/incendium/functions/entity/misc_init/warrior.mcfunction index 429ff08..7bd4246 --- a/data/incendium/functions/entity/withered_skeleton/init.mcfunction +++ b/data/incendium/functions/entity/misc_init/warrior.mcfunction @@ -1,6 +1,10 @@ # from: entity/mobs/init # @s: withered skeleton +tag @s add in.checked +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Headless Warrior",{"translate":"incendium.mob.misc.headless.name"}]}' +team join in.noname @s + attribute @s generic.movement_speed base set 0.16 tag @s add in.withered_skeleton diff --git a/data/incendium/functions/entity/mob/init.mcfunction b/data/incendium/functions/entity/mob/init.mcfunction old mode 100755 new mode 100644 index 7bc6271..59da47f --- a/data/incendium/functions/entity/mob/init.mcfunction +++ b/data/incendium/functions/entity/mob/init.mcfunction @@ -9,16 +9,18 @@ tag @s add in.checked #> Blazes ## Sentry -tag @s[tag=sentry] add in.sentry -tag @s[name="Sentry"] add in.sentry -tag @s[name="Pipeline Sentry"] add in.sentry execute if entity @s[tag=in.sentry] run function incendium:entity/sentry/init +## Nether Reactor mobs +execute if entity @s[type=ghast,tag=in.ghast_sentry] run function incendium:entity/misc_init/ghast_sentry +execute if entity @s[type=wither_skeleton,tag=in.director] run function incendium:entity/misc_init/director + ## Dunes execute if entity @s[type=blaze,predicate=incendium:biome/infernal_dunes,tag=!in.sentry] unless predicate incendium:structure/fortress run function incendium:entity/dune_blaze/init #> Wither Skeletons -execute if entity @s[type=wither_skeleton, predicate=incendium:biome/withered_forest,tag=!in.fortress] run function incendium:entity/withered_skeleton/init +execute if entity @s[type=wither_skeleton,predicate=incendium:biome/withered_forest,predicate=!incendium:structure/fortress] run function incendium:entity/misc_init/warrior +execute if entity @s[type=wither_skeleton,tag=in.scientist] run function incendium:entity/misc_init/scientist #> Spirits execute if entity @s[type=magma_cube,predicate=incendium:biome/has/spirit] if score %count in.spirit_count matches ..30 run function incendium:entity/spirit/init @@ -31,8 +33,9 @@ execute if entity @s[type=magma_cube,predicate=incendium:biome/toxic_heap] if sc # #> Voltaic Lightning # execute if entity @s[type=silverfish,predicate=incendium:biome/voltaic_heap] run function incendium:entity/voltaic_lightning/spawn -#> Torte -execute if entity @s[type=skeleton,name="Torte",predicate=incendium:biome/quartz_flats] run function incendium:entity/torte/init +#> Kitchen Skeletons +execute if entity @s[type=skeleton,tag=in.torte] run function incendium:entity/misc_init/torte +execute if entity @s[type=skeleton,tag=in.bro] run function incendium:entity/misc_init/skeli_bro #> Baby Ghast execute if entity @s[type=allay,tag=in.unborn_ghast] run function incendium:entity/baby_ghast/init @@ -40,7 +43,11 @@ execute if entity @s[type=allay,tag=in.unborn_ghast] run function incendium:enti #> Castle tag @s[tag=castle] add in.castle execute if entity @s[tag=in.castle] run function incendium:castle/mob/init +execute if entity @s[type=hoglin,name="Dinnerbone"] run team join in.noname @s #> Sanctum execute if entity @s[tag=in.sanctum] run function incendium:sanctum/mob/init -execute if entity @s[type=illusioner,name="Sanctum Illusionist",tag=in.sanctum] run function incendium:entity/illusionist/init +execute if entity @s[type=illusioner,name="Sanctum Illusionist",tag=in.sanctum] run function incendium:entity/misc_init/illusionist + +#> Village +execute if entity @s[type=piglin,predicate=incendium:structure/piglin_village] run function incendium:entity/misc_init/piglin_civilian \ No newline at end of file diff --git a/data/incendium/functions/entity/mob/main.mcfunction b/data/incendium/functions/entity/mob/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/other/init.mcfunction b/data/incendium/functions/entity/other/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/other/main.mcfunction b/data/incendium/functions/entity/other/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/sentry/1s.mcfunction b/data/incendium/functions/entity/sentry/1s.mcfunction new file mode 100644 index 0000000..723454c --- /dev/null +++ b/data/incendium/functions/entity/sentry/1s.mcfunction @@ -0,0 +1,4 @@ +# from: clocks/1s +# @s: sentry + +execute store result score @e[type=marker,sort=nearest,limit=1,tag=in.sentry_life,distance=..2] in.sentry_totems run data get entity @s HandItems[0].Count \ No newline at end of file diff --git a/data/incendium/functions/entity/sentry/7s.mcfunction b/data/incendium/functions/entity/sentry/7s.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/sentry/init.mcfunction b/data/incendium/functions/entity/sentry/init.mcfunction old mode 100755 new mode 100644 index 3bfe864..ee87a04 --- a/data/incendium/functions/entity/sentry/init.mcfunction +++ b/data/incendium/functions/entity/sentry/init.mcfunction @@ -1,19 +1,20 @@ -# from: entity/mobs/init +# from: entity/mob/init # @s: sentry -execute unless data entity @s CustomName run data modify entity @s CustomName set value {"text":"Pipeline Sentry","color":"yellow"} -team join in.noname @s - -execute store result score $hand.items in.dummy if data entity @s HandItems[{id:"minecraft:totem_of_undying"}] +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Pipeline Sentry",{"translate":"incendium.mob.pipeline.sentry.name"}],"color":"yellow"}' +#data modify entity @s CustomModelData set value 1460300 -execute if predicate incendium:random/50 run scoreboard players set $count in.dummy 12 -execute if predicate incendium:random/50 run scoreboard players set $count in.dummy 6 +execute if entity @s[tag=in.prime_sentry] run data modify entity @s CustomName set value '"translate": "%1$s%4733088$s","with":["Prime Pipeline Sentry",{"translate":"incendium.mob.pipeline.guard.name"}]' -execute if score $hand.items in.dummy matches ..0 run data modify entity @s HandItems[0] set value {id:"minecraft:totem_of_undying",Count:4b} - -execute if score $hand.items in.dummy matches ..0 if predicate incendium:random/50 store result entity @s HandItems[0].Count byte 1 run scoreboard players get $count in.dummy +team join in.noname @s -data modify entity @s DeathLootTable set value 'incendium:entity/sentry' tag @s add in.ticking_entity +tag @s add in.checked +data modify entity @s DeathLootTable set value 'incendium:entity/sentry' data modify entity @s HandDropChances set value [-327.0f, -327.0f] + +# "Lives" particles + +execute at @s run summon marker ~ ~ ~ {Tags:["in.sentry_life"]} +execute as @e[type=marker,tag=in.sentry_life,sort=nearest,limit=1,distance=..1] run data modify entity @s Rotation set value [90.0f, 0.0f] \ No newline at end of file diff --git a/data/incendium/functions/entity/sentry/life.mcfunction b/data/incendium/functions/entity/sentry/life.mcfunction new file mode 100644 index 0000000..c7e0468 --- /dev/null +++ b/data/incendium/functions/entity/sentry/life.mcfunction @@ -0,0 +1,15 @@ +# from: entity/sentry/main +# @s: Sentry "life" marker + +execute store result entity @s Rotation[0] float 1 run data get entity @e[type=blaze,tag=in.sentry,limit=1,sort=nearest] Rotation[0] +execute store result entity @s Rotation[1] float 1 run scoreboard players get $sentry_lives in.dummy + +# update rotation as well +execute if entity @s[scores={in.sentry_totems=1..}] rotated as @s positioned ^ ^0 ^1 run particle minecraft:dust .5 1 1 0.9 ~ ~-.5 ~ 0 0 0 0 1 force +execute if entity @s[scores={in.sentry_totems=2..}] rotated as @s positioned ^ ^.707 ^.707 run particle minecraft:dust .5 1 1 0.9 ~ ~-.5 ~ 0 0 0 0 1 force +execute if entity @s[scores={in.sentry_totems=3..}] rotated as @s positioned ^ ^1 ^0 run particle minecraft:dust .5 1 1 0.9 ~ ~-.5 ~ 0 0 0 0 1 force +execute if entity @s[scores={in.sentry_totems=4..}] rotated as @s positioned ^ ^.707 ^-.707 run particle minecraft:dust .5 1 1 0.9 ~ ~-.5 ~ 0 0 0 0 1 force +execute if entity @s[scores={in.sentry_totems=5..}] rotated as @s positioned ^ ^0 ^-1 run particle minecraft:dust .5 1 1 0.9 ~ ~-.5 ~ 0 0 0 0 1 force +execute if entity @s[scores={in.sentry_totems=6..}] rotated as @s positioned ^ ^-.707 ^-.707 run particle minecraft:dust .5 1 1 0.9 ~ ~-.5 ~ 0 0 0 0 1 force +execute if entity @s[scores={in.sentry_totems=7..}] rotated as @s positioned ^ ^-1 ^0 run particle minecraft:dust .5 1 1 0.9 ~ ~-.5 ~ 0 0 0 0 1 force +execute if entity @s[scores={in.sentry_totems=8..}] rotated as @s positioned ^ ^-.707 ^.707 run particle minecraft:dust .5 1 1 0.9 ~ ~-.5 ~ 0 0 0 0 1 force \ No newline at end of file diff --git a/data/incendium/functions/entity/sentry/main.mcfunction b/data/incendium/functions/entity/sentry/main.mcfunction old mode 100755 new mode 100644 index bae98ad..d2075ef --- a/data/incendium/functions/entity/sentry/main.mcfunction +++ b/data/incendium/functions/entity/sentry/main.mcfunction @@ -1,9 +1,12 @@ # from: entity/mob/main # @s: sentry -execute if entity @s[tag=!in.sentry_active] run particle minecraft:soul_fire_flame ~ ~0.85 ~ 0.1 0.3 0.1 0.02 1 force @a[distance=..40] - -execute if entity @s[tag=in.sentry_active] run particle minecraft:end_rod ~ ~1.25 ~ 0.3 0.3 0.3 0.05 2 force @a[distance=..40] +# Normal Particles +execute if entity @s[tag=!in.sentry_active] run particle minecraft:end_rod ~ ~0.85 ~ 0.2 0.15 0.05 0.02 1 force @a[distance=..40] +execute if entity @s[tag=in.sentry_active] run particle minecraft:electric_spark ~ ~0.85 ~ 0.1 0.25 0.1 0.15 1 normal @a[distance=..40] # 5% of the time, start a ray to the nearest valid player execute if entity @s[tag=in.sentry_active,predicate=incendium:random/5] positioned ~ ~1.4 ~ facing entity @p[distance=..40,tag=in.valid_player] eyes run function incendium:entity/sentry/ray/start_ray + +# "Lives" Particles +execute anchored eyes positioned ^ ^ ^ as @e[type=marker,tag=in.sentry_life,limit=1,sort=nearest] run function incendium:entity/sentry/life \ No newline at end of file diff --git a/data/incendium/functions/entity/sentry/ray/branch.mcfunction b/data/incendium/functions/entity/sentry/ray/branch.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/sentry/ray/branch_straight.mcfunction b/data/incendium/functions/entity/sentry/ray/branch_straight.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/sentry/ray/hit_entity.mcfunction b/data/incendium/functions/entity/sentry/ray/hit_entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/sentry/ray/ray.mcfunction b/data/incendium/functions/entity/sentry/ray/ray.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/sentry/ray/start_ray.mcfunction b/data/incendium/functions/entity/sentry/ray/start_ray.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/spirit/init.mcfunction b/data/incendium/functions/entity/spirit/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/spirit/main.mcfunction b/data/incendium/functions/entity/spirit/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/spirit/vex_init.mcfunction b/data/incendium/functions/entity/spirit/vex_init.mcfunction old mode 100755 new mode 100644 index de0ab3d..27847a2 --- a/data/incendium/functions/entity/spirit/vex_init.mcfunction +++ b/data/incendium/functions/entity/spirit/vex_init.mcfunction @@ -1,7 +1,7 @@ # from: entity/mobs/init # @s: spirit -data modify entity @s CustomName set value {"text":"Restless Spirit","color":"#329e83"} +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Restless Spirit",{"translate":"incendium.mob.misc.spirit.name"}],"color":"#329e83"}' team join in.noname @s attribute @s generic.movement_speed base set 1.1 diff --git a/data/incendium/functions/entity/torte/init.mcfunction b/data/incendium/functions/entity/torte/init.mcfunction deleted file mode 100755 index e7a81eb..0000000 --- a/data/incendium/functions/entity/torte/init.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# from: entity/mobs/init -# @s: torte - -data modify entity @s CustomName set value {"text":"Torte","color":"#8dd2e8"} - -loot replace entity @s weapon.mainhand loot incendium:artifact/tool/cake_batter -effect give @s strength 999999 3 -data modify entity @s HandDropChances set value [0.50f, 0.50f] -tag @s add in.torte diff --git a/data/incendium/functions/entity/toxic_slime/init.mcfunction b/data/incendium/functions/entity/toxic_slime/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/entity/toxic_slime/slime_init.mcfunction b/data/incendium/functions/entity/toxic_slime/slime_init.mcfunction index cf11528..82b6900 100644 --- a/data/incendium/functions/entity/toxic_slime/slime_init.mcfunction +++ b/data/incendium/functions/entity/toxic_slime/slime_init.mcfunction @@ -1,7 +1,7 @@ # from: entity/mobs/init # @s: toxic slime -data modify entity @s CustomName set value {"text":"Toxic Slime","color":"green"} +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Toxic Slime",{"translate":"incendium.mob.misc.toxic.name"}],"color":"green"}' team join in.noname @s attribute @s generic.movement_speed base set 1.1 diff --git a/data/incendium/functions/entity/voltaic_lightning/spawn.mcfunction b/data/incendium/functions/entity/voltaic_lightning/spawn.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/2s.mcfunction b/data/incendium/functions/hovering_inferno/2s.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/altar/summon.mcfunction b/data/incendium/functions/hovering_inferno/altar/summon.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/armor/main.mcfunction b/data/incendium/functions/hovering_inferno/armor/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/armor/pivot.mcfunction b/data/incendium/functions/hovering_inferno/armor/pivot.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/armor/summon.mcfunction b/data/incendium/functions/hovering_inferno/armor/summon.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/end.mcfunction b/data/incendium/functions/hovering_inferno/end.mcfunction old mode 100755 new mode 100644 index 1069128..73cf3be --- a/data/incendium/functions/hovering_inferno/end.mcfunction +++ b/data/incendium/functions/hovering_inferno/end.mcfunction @@ -5,6 +5,7 @@ execute as @e[type=blaze,tag=in.hovering_inferno,limit=1] at @s run playsound mi execute as @e[type=blaze,tag=in.hovering_inferno] run data merge entity @s {NoAI:1b} tag @a remove in.was_inferno_fight +scoreboard players set $running in.inferno 0 function incendium:hovering_inferno/spell/clear_all schedule clear incendium:hovering_inferno/2s diff --git a/data/incendium/functions/hovering_inferno/end/bad.mcfunction b/data/incendium/functions/hovering_inferno/end/bad.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/entity.mcfunction b/data/incendium/functions/hovering_inferno/entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/inferno/face_player.mcfunction b/data/incendium/functions/hovering_inferno/inferno/face_player.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/inferno/init.mcfunction b/data/incendium/functions/hovering_inferno/inferno/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/inferno/loop/cheater.mcfunction b/data/incendium/functions/hovering_inferno/inferno/loop/cheater.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/inferno/loop/final.mcfunction b/data/incendium/functions/hovering_inferno/inferno/loop/final.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/inferno/loop/low.mcfunction b/data/incendium/functions/hovering_inferno/inferno/loop/low.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/inferno/loop/normal.mcfunction b/data/incendium/functions/hovering_inferno/inferno/loop/normal.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/inferno/main.mcfunction b/data/incendium/functions/hovering_inferno/inferno/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/kill.mcfunction b/data/incendium/functions/hovering_inferno/kill.mcfunction old mode 100755 new mode 100644 index 006551e..48b65de --- a/data/incendium/functions/hovering_inferno/kill.mcfunction +++ b/data/incendium/functions/hovering_inferno/kill.mcfunction @@ -4,6 +4,7 @@ execute as @e[type=blaze,tag=in.hovering_inferno] at @s run forceload remove ~ ~ execute store result score $players in.dummy if entity @a[tag=in.inferno_fight] scoreboard players remove $players in.dummy 2 +scoreboard players set $running in.inferno 0 execute if score $players in.dummy matches 1.. run loot spawn ~ ~ ~ loot incendium:hovering_inferno/extras diff --git a/data/incendium/functions/hovering_inferno/kill/disgracefully.mcfunction b/data/incendium/functions/hovering_inferno/kill/disgracefully.mcfunction old mode 100755 new mode 100644 index 43e5e25..7d6d5ed --- a/data/incendium/functions/hovering_inferno/kill/disgracefully.mcfunction +++ b/data/incendium/functions/hovering_inferno/kill/disgracefully.mcfunction @@ -5,5 +5,6 @@ data modify entity @e[type=blaze,tag=in.hovering_inferno,limit=1] DeathLootTable kill @e[tag=in.inferno_entity] bossbar set incendium:inferno players +scoreboard players set $running in.inferno 0 data remove storage incendium:main inferno diff --git a/data/incendium/functions/hovering_inferno/loop.mcfunction b/data/incendium/functions/hovering_inferno/loop.mcfunction old mode 100755 new mode 100644 index eaeb514..9a14b50 --- a/data/incendium/functions/hovering_inferno/loop.mcfunction +++ b/data/incendium/functions/hovering_inferno/loop.mcfunction @@ -1,7 +1,7 @@ # from: ../summon # loops at either 400t (normal hp, cheater), 320t (low hp), 120t (final) -tellraw @a[tag=in.admin] ["", {"text": "Hovering Inferno: ", "color": "#ff4400"}, {"text": "Spell Cast Debug"}] +tellraw @a[tag=in.admin] [{"translate": "%1$s%4733088$s","with":["Hovering Inferno",{"translate":"incendium.admin.menu.inferno"}],"color":"#ff4400"},{"text":": ","color":"#ff4400"},{"translate": "%1$s%4733088$s","with":["Spell Cast Debug",{"translate":"incendium.inferno.spell.debug"}]}] scoreboard players set $spell_card in.inferno 0 diff --git a/data/incendium/functions/hovering_inferno/main.mcfunction b/data/incendium/functions/hovering_inferno/main.mcfunction old mode 100755 new mode 100644 index e2eee18..9ce2d9f --- a/data/incendium/functions/hovering_inferno/main.mcfunction +++ b/data/incendium/functions/hovering_inferno/main.mcfunction @@ -9,6 +9,4 @@ execute if data storage incendium:main inferno{mode:'final'} run scoreboard play execute if score $shield.pivot in.inferno matches 360.. run scoreboard players set $shield.pivot in.inferno 0 execute as @e[tag=in.inferno_entity] at @s run function incendium:hovering_inferno/entity -execute as @a[tag=in.inferno_fight] at @s run function incendium:hovering_inferno/player/main - -function incendium:border_of_life/tick +execute as @a[tag=in.inferno_fight] at @s run function incendium:hovering_inferno/player/main \ No newline at end of file diff --git a/data/incendium/functions/hovering_inferno/messages/final_fail.mcfunction b/data/incendium/functions/hovering_inferno/messages/final_fail.mcfunction old mode 100755 new mode 100644 index 562f48e..5693268 --- a/data/incendium/functions/hovering_inferno/messages/final_fail.mcfunction +++ b/data/incendium/functions/hovering_inferno/messages/final_fail.mcfunction @@ -1,5 +1,5 @@ # from: ../end/bad -tellraw @a[tag=in.was_inferno_fight] [{"text":"","color":"#eb783f"}, {"translate": "Incendium", "color": "#ff6600", "bold": true}, ": ", {"translate": "The"}, " ", {"translate": "Hovering Inferno", "bold": true}, " ", {"translate": "has defeated all challengers and now peacefully lays rest"}] +tellraw @a[tag=in.was_inferno_fight] [{"translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#ff6600", "bold": true}, ": ", {"translate": "%1$s%4733088$s","with":["The Hovering Inferno",{"translate":"incendium.admin.menu.inferno"}], "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["has defeated all challengers and now peacefully lays rest",{"translate":"incendium.inferno.system.fail.final"}]}] tag @a remove in.was_inferno_fight diff --git a/data/incendium/functions/hovering_inferno/messages/inferno_already_running.mcfunction b/data/incendium/functions/hovering_inferno/messages/inferno_already_running.mcfunction old mode 100755 new mode 100644 index 140f990..fe10f1f --- a/data/incendium/functions/hovering_inferno/messages/inferno_already_running.mcfunction +++ b/data/incendium/functions/hovering_inferno/messages/inferno_already_running.mcfunction @@ -1,3 +1,3 @@ # from: entity/other/init -tellraw @a[distance=..16] [{"text":"","color":"#eb783f"}, {"translate": "Incendium", "color": "#ff6600", "bold": true}, ": ", {"translate": "the"}, " ", {"translate": "Hovering Inferno", "bold": true}, " ", {"translate": "is running elsewhere"}] +tellraw @a[distance=..16] [{"translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#ff6600", "bold": true}, ": ", {"translate": "%1$s%4733088$s","with":["The Hovering Inferno",{"translate":"incendium.admin.menu.inferno"}], "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["is running elsewhere",{"translate":"incendium.inferno.system.running"}]}] diff --git a/data/incendium/functions/hovering_inferno/messages/normal_fail.mcfunction b/data/incendium/functions/hovering_inferno/messages/normal_fail.mcfunction old mode 100755 new mode 100644 index aeed6e8..66ad493 --- a/data/incendium/functions/hovering_inferno/messages/normal_fail.mcfunction +++ b/data/incendium/functions/hovering_inferno/messages/normal_fail.mcfunction @@ -1,5 +1,5 @@ # from: ../end/bad -tellraw @a[tag=in.was_inferno_fight] [{"text":"","color":"#eb783f"}, {"translate": "Incendium", "color": "#ff6600", "bold": true}, ": ", {"translate": "The"}, " ", {"translate": "Hovering Inferno", "bold": true}, " ", {"translate": "faces no challengers and now lays rest"}] +tellraw @a[tag=in.was_inferno_fight] [{"translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#ff6600", "bold": true}, ": ", {"translate": "%1$s%4733088$s","with":["The Hovering Inferno",{"translate":"incendium.admin.menu.inferno"}], "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["faces no challengers and now lays rest",{"translate":"incendium.inferno.system.fail.normal"}]}] tag @a remove in.was_inferno_fight diff --git a/data/incendium/functions/hovering_inferno/messages/summon_disabled.mcfunction b/data/incendium/functions/hovering_inferno/messages/summon_disabled.mcfunction old mode 100755 new mode 100644 index 7a81b17..33b5b2c --- a/data/incendium/functions/hovering_inferno/messages/summon_disabled.mcfunction +++ b/data/incendium/functions/hovering_inferno/messages/summon_disabled.mcfunction @@ -1,3 +1,3 @@ # from: entity/other/init -tellraw @a[distance=..16] [{"text":"","color":"#eb783f"}, {"translate": "Incendium", "color": "#ff6600", "bold": true}, ": ", {"translate": "the"}, " ", {"translate": "Hovering Inferno", "bold": true}, " ", {"translate": "has been disabled"}] +tellraw @a[distance=..16] [{"translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#ff6600", "bold": true}, ": ", {"translate": "%1$s%4733088$s","with":["The Hovering Inferno",{"translate":"incendium.admin.menu.inferno"}], "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["has been disabled",{"translate":"incendium.inferno.system.disabled"}]}] diff --git a/data/incendium/functions/hovering_inferno/misc/generic_hit_entity.mcfunction b/data/incendium/functions/hovering_inferno/misc/generic_hit_entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/player/main.mcfunction b/data/incendium/functions/hovering_inferno/player/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/player/warning.mcfunction b/data/incendium/functions/hovering_inferno/player/warning.mcfunction old mode 100755 new mode 100644 index 5102b24..9594a3e --- a/data/incendium/functions/hovering_inferno/player/warning.mcfunction +++ b/data/incendium/functions/hovering_inferno/player/warning.mcfunction @@ -1,9 +1,9 @@ # from ../2s # @s: player, at hovering_inferno -tellraw @s [{"translate": "You cannot leave the", "color": "#ff6600"}, " ", {"translate": "Hovering Inferno", "bold": true}, " ", {"translate": "fight in it's final phase."}] +tellraw @s [{"translate": "%1$s%4733088$s","with":["You cannot leave the",{"translate":"incendium.inferno.system.warning1"}], "color": "#ff6600"}, " ", {"translate": "%1$s%4733088$s","with":["Hovering Inferno",{"translate":"incendium.admin.menu.inferno"}], "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["fight in its final phase",{"translate":"incendium.inferno.system.warning2"}]}] title @s title "" -title @s subtitle {"translate": "Return to the fight", "color": "#ff6600"} +title @s subtitle {"translate": "%1$s%4733088$s","with":["Return to the fight",{"translate":"incendium.inferno.system.warning"}], "color": "#ff6600"} effect give @s instant_damage 1 0 true diff --git a/data/incendium/functions/hovering_inferno/spell/bubbles/clear.mcfunction b/data/incendium/functions/hovering_inferno/spell/bubbles/clear.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/bubbles/entity.mcfunction b/data/incendium/functions/hovering_inferno/spell/bubbles/entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/bubbles/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/bubbles/main.mcfunction old mode 100755 new mode 100644 index bd1a776..face427 --- a/data/incendium/functions/hovering_inferno/spell/bubbles/main.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/bubbles/main.mcfunction @@ -1,6 +1,6 @@ # bubbles! -tellraw @a[tag=in.admin] " Bubbles Attack -- Normal" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Bubbles: Normal",{"translate":"incendium.inferno.spell.bubbles.normal"}]} schedule clear incendium:hovering_inferno/spell/shulker/last function incendium:hovering_inferno/spell/kill/bullets diff --git a/data/incendium/functions/hovering_inferno/spell/bubbles/ray/iter.mcfunction b/data/incendium/functions/hovering_inferno/spell/bubbles/ray/iter.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/bubbles/ray/start.mcfunction b/data/incendium/functions/hovering_inferno/spell/bubbles/ray/start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/alt/entity.mcfunction b/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/alt/entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/alt/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/alt/main.mcfunction old mode 100755 new mode 100644 index ead8024..e1a16c6 --- a/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/alt/main.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/alt/main.mcfunction @@ -1,5 +1,5 @@ # butterfly -tellraw @a[tag=in.admin] " Butterfly Lasers -- Alt" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Butterfly Lasers: Alt",{"translate":"incendium.inferno.spell.butterfly.alt"}]} execute at @e[type=blaze,tag=in.hovering_inferno,limit=1] run function incendium:hovering_inferno/spell/butterfly_lasers/alt/summon diff --git a/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/alt/ray/hit.mcfunction b/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/alt/ray/hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/alt/ray/iter.mcfunction b/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/alt/ray/iter.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/alt/ray/start.mcfunction b/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/alt/ray/start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/alt/summon.mcfunction b/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/alt/summon.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/clear.mcfunction b/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/clear.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/normal/entity.mcfunction b/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/normal/entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/normal/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/normal/main.mcfunction old mode 100755 new mode 100644 index 8f55fc8..1d6b7ee --- a/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/normal/main.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/normal/main.mcfunction @@ -1,5 +1,5 @@ # butterfly -tellraw @a[tag=in.admin] " Butterfly Lasers -- Normal" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Butterfly Lasers: Normal",{"translate":"incendium.inferno.spell.butterfly.normal"}]} execute at @e[type=blaze,tag=in.hovering_inferno,limit=1] run function incendium:hovering_inferno/spell/butterfly_lasers/normal/summon diff --git a/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/normal/ray/hit.mcfunction b/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/normal/ray/hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/normal/ray/iter.mcfunction b/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/normal/ray/iter.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/normal/ray/start.mcfunction b/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/normal/ray/start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/normal/summon.mcfunction b/data/incendium/functions/hovering_inferno/spell/butterfly_lasers/normal/summon.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/clear_all.mcfunction b/data/incendium/functions/hovering_inferno/spell/clear_all.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/dash/center/entity.mcfunction b/data/incendium/functions/hovering_inferno/spell/dash/center/entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/dash/center/loop.mcfunction b/data/incendium/functions/hovering_inferno/spell/dash/center/loop.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/dash/center/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/dash/center/main.mcfunction old mode 100755 new mode 100644 index 81936a7..1fbb8b5 --- a/data/incendium/functions/hovering_inferno/spell/dash/center/main.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/dash/center/main.mcfunction @@ -1,6 +1,6 @@ # Dash Center Spell -tellraw @a[tag=in.admin] " Dash Attack -- Center" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Dash: Center",{"translate":"incendium.inferno.spell.dash.center"}]} scoreboard players set $dash in.inferno 0 execute as @e[type=blaze,tag=in.hovering_inferno] at @s facing entity @e[type=marker,tag=in.altar,distance=..50,limit=1] eyes run tp @s ~ ~ ~ ~ -18 diff --git a/data/incendium/functions/hovering_inferno/spell/dash/clear.mcfunction b/data/incendium/functions/hovering_inferno/spell/dash/clear.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/dash/entity.mcfunction b/data/incendium/functions/hovering_inferno/spell/dash/entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/dash/last_spell/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/dash/last_spell/main.mcfunction old mode 100755 new mode 100644 index 9e10fb8..e7232d7 --- a/data/incendium/functions/hovering_inferno/spell/dash/last_spell/main.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/dash/last_spell/main.mcfunction @@ -1,6 +1,6 @@ # last_spell dash? -tellraw @a[tag=in.admin] " Dash Attack -- Last" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Last: Dash",{"translate":"incendium.inferno.spell.last.dash"}]} scoreboard players set $dash in.inferno 0 execute as @e[type=blaze,tag=in.hovering_inferno,limit=1] at @s facing entity @p[tag=in.survival_player,distance=..50] eyes run tp @s ~ ~ ~ ~ ~ diff --git a/data/incendium/functions/hovering_inferno/spell/dash/loop.mcfunction b/data/incendium/functions/hovering_inferno/spell/dash/loop.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/dash/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/dash/main.mcfunction old mode 100755 new mode 100644 index c53fc18..7de20d3 --- a/data/incendium/functions/hovering_inferno/spell/dash/main.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/dash/main.mcfunction @@ -1,6 +1,6 @@ # Dash -tellraw @a[tag=in.admin] " Dash Attack -- Normal" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Dash: Normal",{"translate":"incendium.inferno.spell.dash.normal"}]} scoreboard players set $dash in.inferno 0 diff --git a/data/incendium/functions/hovering_inferno/spell/dash/no_fire/entity.mcfunction b/data/incendium/functions/hovering_inferno/spell/dash/no_fire/entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/dash/no_fire/loop.mcfunction b/data/incendium/functions/hovering_inferno/spell/dash/no_fire/loop.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/dash/no_fire/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/dash/no_fire/main.mcfunction old mode 100755 new mode 100644 index 882815a..ae272f2 --- a/data/incendium/functions/hovering_inferno/spell/dash/no_fire/main.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/dash/no_fire/main.mcfunction @@ -1,6 +1,6 @@ # no fire dash -tellraw @a[tag=in.admin] " Dash Attack -- No Fire" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Dash: No Fire",{"translate":"incendium.inferno.spell.dash.no_fire"}]} scoreboard players set $dash in.inferno 0 diff --git a/data/incendium/functions/hovering_inferno/spell/detonate.mcfunction b/data/incendium/functions/hovering_inferno/spell/detonate.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/fireball/attack.mcfunction b/data/incendium/functions/hovering_inferno/spell/fireball/attack.mcfunction old mode 100755 new mode 100644 index 1c3147d..0aeb650 --- a/data/incendium/functions/hovering_inferno/spell/fireball/attack.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/fireball/attack.mcfunction @@ -1,6 +1,6 @@ # attack :D -tellraw @a[tag=in.admin] " Fireball Attack -- Normal" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Fireball: Normal",{"translate":"incendium.inferno.spell.fireball.normal"}]} function incendium:hovering_inferno/spell/kill/bullets playsound minecraft:entity.illusioner.cast_spell player @a[distance=..40] ~ ~ ~ 2 0.9 1 diff --git a/data/incendium/functions/hovering_inferno/spell/fireball/attack_alt.mcfunction b/data/incendium/functions/hovering_inferno/spell/fireball/attack_alt.mcfunction old mode 100755 new mode 100644 index 8df9d43..78dbf79 --- a/data/incendium/functions/hovering_inferno/spell/fireball/attack_alt.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/fireball/attack_alt.mcfunction @@ -1,6 +1,6 @@ # attack :D -tellraw @a[tag=in.admin] " Fireball Attack -- Alt" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Fireball: Alt",{"translate":"incendium.inferno.spell.fireball.alt"}]} function incendium:hovering_inferno/spell/kill/bullets playsound minecraft:entity.illusioner.cast_spell player @a[distance=..40] ~ ~ ~ 2 0.9 1 diff --git a/data/incendium/functions/hovering_inferno/spell/fireball/clear.mcfunction b/data/incendium/functions/hovering_inferno/spell/fireball/clear.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/fireball/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/fireball/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/firework/clear.mcfunction b/data/incendium/functions/hovering_inferno/spell/firework/clear.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/firework/direct/aec.mcfunction b/data/incendium/functions/hovering_inferno/spell/firework/direct/aec.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/firework/direct/loop.mcfunction b/data/incendium/functions/hovering_inferno/spell/firework/direct/loop.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/firework/direct/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/firework/direct/main.mcfunction old mode 100755 new mode 100644 index 00b7c66..d3f0ca6 --- a/data/incendium/functions/hovering_inferno/spell/firework/direct/main.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/firework/direct/main.mcfunction @@ -1,6 +1,6 @@ # direct attack spell -tellraw @a[tag=in.admin] " Direct Attack -- Normal" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Firework: Direct",{"translate":"incendium.inferno.spell.firework.direct"}]} execute if predicate incendium:random/30 run scoreboard players add $spell_card in.inferno 1 scoreboard players set $attack in.inferno 0 diff --git a/data/incendium/functions/hovering_inferno/spell/firework/direct_alt/aec.mcfunction b/data/incendium/functions/hovering_inferno/spell/firework/direct_alt/aec.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/firework/direct_alt/loop.mcfunction b/data/incendium/functions/hovering_inferno/spell/firework/direct_alt/loop.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/firework/direct_alt/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/firework/direct_alt/main.mcfunction old mode 100755 new mode 100644 index 9ecace4..93814d8 --- a/data/incendium/functions/hovering_inferno/spell/firework/direct_alt/main.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/firework/direct_alt/main.mcfunction @@ -1,6 +1,6 @@ # direct attack spell -tellraw @a[tag=in.admin] " Direct Attack -- Alt" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Firework: Direct Alt",{"translate":"incendium.inferno.spell.firework.direct_alt"}]} execute if predicate incendium:random/30 run scoreboard players add $spell_card in.inferno 1 scoreboard players set $attack_alt in.inferno 0 diff --git a/data/incendium/functions/hovering_inferno/spell/firework/spread/alt.mcfunction b/data/incendium/functions/hovering_inferno/spell/firework/spread/alt.mcfunction old mode 100755 new mode 100644 index 3a06536..0bfebe2 --- a/data/incendium/functions/hovering_inferno/spell/firework/spread/alt.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/firework/spread/alt.mcfunction @@ -1,6 +1,6 @@ # firework attack alt -tellraw @a[tag=in.admin] " Spread Attack -- Alt" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Firework: Spread Alt",{"translate":"incendium.inferno.spell.firework.spread_alt"}]} function incendium:hovering_inferno/spell/kill/bullets playsound minecraft:entity.evoker.prepare_summon player @a[distance=..40] ~ ~ ~ 2 1.1 diff --git a/data/incendium/functions/hovering_inferno/spell/firework/spread/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/firework/spread/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/firework/spread/normal.mcfunction b/data/incendium/functions/hovering_inferno/spell/firework/spread/normal.mcfunction old mode 100755 new mode 100644 index 1f5e276..423c2da --- a/data/incendium/functions/hovering_inferno/spell/firework/spread/normal.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/firework/spread/normal.mcfunction @@ -1,6 +1,6 @@ # firework attack normal -tellraw @a[tag=in.admin] " Spread Attack -- Normal" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Firework: Spread",{"translate":"incendium.inferno.spell.firework.spread"}]} function incendium:hovering_inferno/spell/kill/bullets playsound minecraft:entity.evoker.prepare_summon player @a[distance=..40] ~ ~ ~ 2 0.9 diff --git a/data/incendium/functions/hovering_inferno/spell/kill/arrows.mcfunction b/data/incendium/functions/hovering_inferno/spell/kill/arrows.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/kill/bullets.mcfunction b/data/incendium/functions/hovering_inferno/spell/kill/bullets.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/kill/butterfly.mcfunction b/data/incendium/functions/hovering_inferno/spell/kill/butterfly.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/kill/fireballs.mcfunction b/data/incendium/functions/hovering_inferno/spell/kill/fireballs.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/last_spell/clear.mcfunction b/data/incendium/functions/hovering_inferno/spell/last_spell/clear.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/last_spell/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/last_spell/main.mcfunction old mode 100755 new mode 100644 index b54829c..fdb1aa4 --- a/data/incendium/functions/hovering_inferno/spell/last_spell/main.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/last_spell/main.mcfunction @@ -1,7 +1,7 @@ # from: ./prepare # @s: inferno -tellraw @a[tag=in.admin] " Final Phase -- Main" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Last: Main",{"translate":"incendium.inferno.spell.last.main"}]} execute positioned ~ 50 ~ at @e[type=marker,tag=in.altar,sort=nearest,distance=..50] run tp @s ~ ~1.5 ~ diff --git a/data/incendium/functions/hovering_inferno/spell/last_spell/prepare.mcfunction b/data/incendium/functions/hovering_inferno/spell/last_spell/prepare.mcfunction old mode 100755 new mode 100644 index 88e3fe2..bbcf6c7 --- a/data/incendium/functions/hovering_inferno/spell/last_spell/prepare.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/last_spell/prepare.mcfunction @@ -1,7 +1,7 @@ # from: ../inferno/main # @s: inferno -tellraw @a[tag=in.admin] " Final Phase -- Prepare" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Last: Prepare",{"translate":"incendium.inferno.spell.last.prepare"}]} function incendium:hovering_inferno/spell/clear_all diff --git a/data/incendium/functions/hovering_inferno/spell/shield_lasers/all/loop.mcfunction b/data/incendium/functions/hovering_inferno/spell/shield_lasers/all/loop.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/shield_lasers/all/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/shield_lasers/all/main.mcfunction old mode 100755 new mode 100644 index 8b1cff9..ed7a1de --- a/data/incendium/functions/hovering_inferno/spell/shield_lasers/all/main.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/shield_lasers/all/main.mcfunction @@ -1,6 +1,6 @@ # shield lasers - all -tellraw @a[tag=in.admin] " Shield Lasers -- All" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Shield Lasers: All",{"translate":"incendium.inferno.spell.lasers.all"}]} scoreboard players set $laser_time in.inferno 0 execute if predicate incendium:random/50 run scoreboard players add $spell_card in.inferno 1 diff --git a/data/incendium/functions/hovering_inferno/spell/shield_lasers/clear.mcfunction b/data/incendium/functions/hovering_inferno/spell/shield_lasers/clear.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/shield_lasers/half/loop.mcfunction b/data/incendium/functions/hovering_inferno/spell/shield_lasers/half/loop.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/shield_lasers/half/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/shield_lasers/half/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/shield_lasers/random.mcfunction b/data/incendium/functions/hovering_inferno/spell/shield_lasers/random.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/shield_lasers/ray/iter.mcfunction b/data/incendium/functions/hovering_inferno/spell/shield_lasers/ray/iter.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/shield_lasers/ray/start.mcfunction b/data/incendium/functions/hovering_inferno/spell/shield_lasers/ray/start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/shulker/arrows.mcfunction b/data/incendium/functions/hovering_inferno/spell/shulker/arrows.mcfunction old mode 100755 new mode 100644 index 8344ccc..db2188d --- a/data/incendium/functions/hovering_inferno/spell/shulker/arrows.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/shulker/arrows.mcfunction @@ -1,6 +1,6 @@ # summons arrows -tellraw @a[tag=in.admin] " Shulker Attack -- Arrows" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Shulker: Arrows",{"translate":"incendium.inferno.spell.shulker.arrows"}]} playsound minecraft:entity.wither.shoot player @a[distance=..50] ~ ~ ~ 5 0.5 1 particle minecraft:flame ~ ~ ~ 0 0 0 0.4 300 force diff --git a/data/incendium/functions/hovering_inferno/spell/shulker/attack.mcfunction b/data/incendium/functions/hovering_inferno/spell/shulker/attack.mcfunction old mode 100755 new mode 100644 index ecda8dc..3a563d0 --- a/data/incendium/functions/hovering_inferno/spell/shulker/attack.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/shulker/attack.mcfunction @@ -1,6 +1,6 @@ # shulker attack -tellraw @a[tag=in.admin] " Shulker Attack -- Normal" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Shulker: Attack",{"translate":"incendium.inferno.spell.shulker.attack"}]} scoreboard players add $spell_card in.inferno 1 diff --git a/data/incendium/functions/hovering_inferno/spell/shulker/clear.mcfunction b/data/incendium/functions/hovering_inferno/spell/shulker/clear.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/shulker/curved.mcfunction b/data/incendium/functions/hovering_inferno/spell/shulker/curved.mcfunction old mode 100755 new mode 100644 index d14bde0..8ee2785 --- a/data/incendium/functions/hovering_inferno/spell/shulker/curved.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/shulker/curved.mcfunction @@ -1,6 +1,6 @@ # shulker curved -tellraw @a[tag=in.admin] " Shulker Attack -- Curved" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Shulker: Curved",{"translate":"incendium.inferno.spell.shulker.curved"}]} scoreboard players add $spell_card in.inferno 1 diff --git a/data/incendium/functions/hovering_inferno/spell/shulker/fireballs.mcfunction b/data/incendium/functions/hovering_inferno/spell/shulker/fireballs.mcfunction old mode 100755 new mode 100644 index 7f968f4..b058fcb --- a/data/incendium/functions/hovering_inferno/spell/shulker/fireballs.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/shulker/fireballs.mcfunction @@ -1,6 +1,6 @@ # spawn fireballs -tellraw @a[tag=in.admin] " Shulker Attack -- Fireballs" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Shulker: Fireballs",{"translate":"incendium.inferno.spell.shulker.fireballs"}]} function incendium:hovering_inferno/spell/kill/bullets playsound minecraft:entity.wither.shoot player @a[distance=..50] ~ ~ ~ 5 0.3 1 diff --git a/data/incendium/functions/hovering_inferno/spell/shulker/init.mcfunction b/data/incendium/functions/hovering_inferno/spell/shulker/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/shulker/last.mcfunction b/data/incendium/functions/hovering_inferno/spell/shulker/last.mcfunction old mode 100755 new mode 100644 index c42ef0d..ae078a0 --- a/data/incendium/functions/hovering_inferno/spell/shulker/last.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/shulker/last.mcfunction @@ -1,6 +1,6 @@ # last -tellraw @a[tag=in.admin] " Shulker Attack -- Last" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Last: Shulker",{"translate":"incendium.inferno.spell.last.shulker"}]} execute as @e[type=blaze,tag=in.hovering_inferno,limit=1] at @s run function incendium:hovering_inferno/spell/shulker/last/entity diff --git a/data/incendium/functions/hovering_inferno/spell/shulker/last/clear.mcfunction b/data/incendium/functions/hovering_inferno/spell/shulker/last/clear.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/shulker/last/entity.mcfunction b/data/incendium/functions/hovering_inferno/spell/shulker/last/entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/shulker/shoot.mcfunction b/data/incendium/functions/hovering_inferno/spell/shulker/shoot.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/summon/blaze/entity.mcfunction b/data/incendium/functions/hovering_inferno/spell/summon/blaze/entity.mcfunction old mode 100755 new mode 100644 index 232bfc2..3813c3d --- a/data/incendium/functions/hovering_inferno/spell/summon/blaze/entity.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/summon/blaze/entity.mcfunction @@ -4,7 +4,7 @@ playsound minecraft:entity.evoker.prepare_attack player @a[distance=..100] ~ ~ ~ playsound minecraft:entity.elder_guardian.curse player @a[distance=..100] ~ ~ ~ 0.5 1.5 0.5 particle minecraft:flame ~ ~ ~ 0 0 0 0.4 100 force -execute at @a[distance=..100,tag=in.survival_player] run summon blaze ~ ~ ~3 {Tags:["in.checked","in.inferno_entity","in.summoned_blaze"],DeathLootTable:"incendium:entity/dune_blaze"} -execute at @a[distance=..100,tag=in.survival_player] run summon blaze ~ ~ ~-3 {Tags:["in.checked","in.inferno_entity","in.summoned_blaze"],DeathLootTable:"incendium:entity/dune_blaze"} +execute at @a[distance=..100,tag=in.survival_player] run summon blaze ~ ~ ~3 {Tags:["in.checked","in.inferno_entity","in.summoned_blaze"],DeathLootTable:"incendium:entity/dune_blaze",CustomName:'{"translate": "%1$s%4733088$s","with":["Infernal Minion",{"translate":"incendium.mob.inferno.minion.name"}]}'} +execute at @a[distance=..100,tag=in.survival_player] run summon blaze ~ ~ ~-3 {Tags:["in.checked","in.inferno_entity","in.summoned_blaze"],DeathLootTable:"incendium:entity/dune_blaze",CustomName:'{"translate": "%1$s%4733088$s","with":["Infernal Minion",{"translate":"incendium.mob.inferno.minion.name"}]}'} execute at @e[distance=..100,type=blaze,tag=in.inferno_entity,tag=in.summoned_blaze] run particle minecraft:flame ~ ~ ~ 0 0 0 0.2 100 force diff --git a/data/incendium/functions/hovering_inferno/spell/summon/blaze/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/summon/blaze/main.mcfunction old mode 100755 new mode 100644 index 50cc784..993031e --- a/data/incendium/functions/hovering_inferno/spell/summon/blaze/main.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/summon/blaze/main.mcfunction @@ -1,5 +1,5 @@ # blaze pog -tellraw @a[tag=in.admin] " Summon Entity -- Blaze" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Summon: Blaze",{"translate":"incendium.inferno.spell.summon.blaze"}]} execute at @e[type=blaze,tag=in.hovering_inferno,limit=1] run function incendium:hovering_inferno/spell/summon/blaze/entity diff --git a/data/incendium/functions/hovering_inferno/spell/summon/clear.mcfunction b/data/incendium/functions/hovering_inferno/spell/summon/clear.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/spell/summon/vex/entity.mcfunction b/data/incendium/functions/hovering_inferno/spell/summon/vex/entity.mcfunction old mode 100755 new mode 100644 index 170d40d..7e7ff95 --- a/data/incendium/functions/hovering_inferno/spell/summon/vex/entity.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/summon/vex/entity.mcfunction @@ -2,6 +2,6 @@ playsound minecraft:entity.evoker.prepare_attack player @a[distance=..50] ~ ~ ~ 5 0.9 1 particle minecraft:soul_fire_flame ~ ~ ~ 0 0 0 0.4 200 force -summon minecraft:vex ~ ~1 ~ {Tags:["in.inferno_entity", "in.minion"],LifeTicks:500,CustomName:'[{"text":"Minion"}]',HandItems:[{id:"netherite_sword",Count:1}],HandDropChances:[-327.0f]} +summon minecraft:vex ~ ~1 ~ {Tags:["in.inferno_entity", "in.minion"],LifeTicks:500,CustomName:'{"translate": "%1$s%4733088$s","with":["Infernal Minion",{"translate":"incendium.mob.inferno.minion.name"}]}',HandItems:[{id:"netherite_sword",Count:1}],HandDropChances:[-327.0f]} execute if predicate incendium:random/90 run schedule function incendium:hovering_inferno/spell/summon/vex/main 50t diff --git a/data/incendium/functions/hovering_inferno/spell/summon/vex/main.mcfunction b/data/incendium/functions/hovering_inferno/spell/summon/vex/main.mcfunction old mode 100755 new mode 100644 index abc97aa..5b8904a --- a/data/incendium/functions/hovering_inferno/spell/summon/vex/main.mcfunction +++ b/data/incendium/functions/hovering_inferno/spell/summon/vex/main.mcfunction @@ -1,7 +1,7 @@ # summon vex # self-looped: 50t -tellraw @a[tag=in.admin] " Summon Entity -- Vex" +tellraw @a[tag=in.admin] {"translate": "%1$s%4733088$s","with":["Summon: Vex",{"translate":"incendium.inferno.spell.summon.vex"}]} scoreboard players add $spell_card in.inferno 1 execute at @e[type=blaze,tag=in.hovering_inferno,limit=1] run function incendium:hovering_inferno/spell/summon/vex/entity diff --git a/data/incendium/functions/hovering_inferno/summon.mcfunction b/data/incendium/functions/hovering_inferno/summon.mcfunction old mode 100755 new mode 100644 index 862bf99..58c3519 --- a/data/incendium/functions/hovering_inferno/summon.mcfunction +++ b/data/incendium/functions/hovering_inferno/summon.mcfunction @@ -1,16 +1,16 @@ # from: entity/other/init # @s: item -scoreboard players set $running in.inferno 0 +scoreboard players set $running in.inferno 1 scoreboard players set $cheater in.inferno 0 scoreboard players set $last.timer in.inferno 0 # summon the damn thing -execute at @e[type=marker,tag=in.altar,distance=..4] run summon blaze ~ ~4 ~ {Attributes: [{Base: 700.0d, Name: "minecraft:generic.max_health"}, {Base: 20.0d, Name: "minecraft:generic.armor"}, {Base: 0.87d, Name: "minecraft:generic.knockback_resistance"}, {Base: 20.0d, Name: "minecraft:generic.attack_knockback"}, {Base: 12.0d, Name: "minecraft:generic.armor_toughness"}, {Base: 0.4d, Name: "minecraft:generic.movement_speed"}, {Base: 20.0d, Name: "minecraft:generic.attack_damage"}, {Base: 70.0d, Name: "minecraft:generic.follow_range"}], PersistenceRequired: 1b, Tags: ["in.hovering_inferno"], Health: 700.0f, Rotation: [-129.48582f, 0.0f], HandItems: [{id:"totem_of_undying",Count:1b}, {}], CustomName: '{"text":"Hovering Inferno", "color": "#ff6600"}', CanPickUpLoot: 0b, DeathLootTable:"incendium:hovering_inferno"} +execute at @e[type=marker,tag=in.altar,distance=..4] run summon blaze ~ ~4 ~ {Attributes: [{Base: 700.0d, Name: "minecraft:generic.max_health"}, {Base: 20.0d, Name: "minecraft:generic.armor"}, {Base: 0.87d, Name: "minecraft:generic.knockback_resistance"}, {Base: 20.0d, Name: "minecraft:generic.attack_knockback"}, {Base: 12.0d, Name: "minecraft:generic.armor_toughness"}, {Base: 0.4d, Name: "minecraft:generic.movement_speed"}, {Base: 20.0d, Name: "minecraft:generic.attack_damage"}, {Base: 70.0d, Name: "minecraft:generic.follow_range"}], PersistenceRequired: 1b, Tags: ["in.hovering_inferno"], Health: 700.0f, Rotation: [-129.48582f, 0.0f], HandItems: [{id:"totem_of_undying",Count:1b}, {}], CustomName: '{"translate": "%1$s%4733088$s","with":["Hovering Inferno",{"translate":"incendium.admin.menu.inferno"}], "color": "#ff6600"}', CanPickUpLoot: 0b, DeathLootTable:"incendium:hovering_inferno"} execute as @e[type=blaze,tag=in.hovering_inferno,tag=!in.checked,distance=..25] at @s run function incendium:hovering_inferno/inferno/init # get bossbar -bossbar add incendium:inferno {"text":"Hovering Inferno","color":"#ff6600"} +bossbar add incendium:inferno {"translate": "%1$s%4733088$s","with":["Hovering Inferno",{"translate":"incendium.admin.menu.inferno"}],"color":"#ff6600"} bossbar set incendium:inferno color yellow bossbar set incendium:inferno value 700 diff --git a/data/incendium/functions/hovering_inferno/timer.mcfunction b/data/incendium/functions/hovering_inferno/timer.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/xp/entity.mcfunction b/data/incendium/functions/hovering_inferno/xp/entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/hovering_inferno/xp/main.mcfunction b/data/incendium/functions/hovering_inferno/xp/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/blazing_hatchet/kick.mcfunction b/data/incendium/functions/item/blazing_hatchet/kick.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/blazing_hatchet/on_hit.mcfunction b/data/incendium/functions/item/blazing_hatchet/on_hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/cake_batter/on_hit.mcfunction b/data/incendium/functions/item/cake_batter/on_hit.mcfunction old mode 100755 new mode 100644 index 06da83e..6aae8e4 --- a/data/incendium/functions/item/cake_batter/on_hit.mcfunction +++ b/data/incendium/functions/item/cake_batter/on_hit.mcfunction @@ -4,8 +4,8 @@ execute store success score $hunger in.dummy if predicate incendium:random/5 execute store success score $feed in.dummy if predicate incendium:random/25 -execute if score $hunger in.dummy matches 1.. run tellraw @s {"text": "You've eaten too much cake and received a stomach ache", "color": "#ff69b4"} +execute if score $hunger in.dummy matches 1.. run tellraw @s {"translate": "%1$s%4733088$s","with":["You've eaten too much cake and received a stomach ache",{"translate":"incendium.item.cake.system.ache"}], "color": "#ff69b4"} execute if score $hunger in.dummy matches 1.. run effect give @s minecraft:hunger 5 5 -execute unless score $hunger in.dummy matches 1.. if score $feed in.dummy matches 1.. run tellraw @s {"text": "Yum", "color": "#ffddf4"} +execute unless score $hunger in.dummy matches 1.. if score $feed in.dummy matches 1.. run tellraw @s {"translate": "%1$s%4733088$s","with":["Yum",{"translate":"incendium.item.cake.system.yum"}], "color": "#ffddf4"} execute unless score $hunger in.dummy matches 1.. if score $feed in.dummy matches 1.. run effect give @s minecraft:saturation 3 1 diff --git a/data/incendium/functions/item/chilling_blade/on_hit.mcfunction b/data/incendium/functions/item/chilling_blade/on_hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/firestorm/arrow.mcfunction b/data/incendium/functions/item/firestorm/arrow.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/firestorm/check_arrow.mcfunction b/data/incendium/functions/item/firestorm/check_arrow.mcfunction old mode 100755 new mode 100644 index eb88889..e17b205 --- a/data/incendium/functions/item/firestorm/check_arrow.mcfunction +++ b/data/incendium/functions/item/firestorm/check_arrow.mcfunction @@ -7,7 +7,7 @@ execute store result score $failed in.dummy if entity @s[predicate=incendium:hol execute if score $failed in.dummy matches 1.. run item modify entity @s weapon.mainhand incendium:unload execute if score $failed in.dummy matches 1.. run item modify entity @s weapon.mainhand incendium:damage -execute if score $failed in.dummy matches 1.. run tellraw @s [{"translate": "Firestorm", "color": "#ff4400", "bold": true}, " ", {"translate": "can only load", "color":"#eb783f", "bold": false}, " ", {"text": "Spectral Arrows", "color":"#eb783f"}] +execute if score $failed in.dummy matches 1.. run tellraw @s [{"translate": "%1$s%4733088$s","with":["Firestorm",{"translate":"incendium.item.firestorm.name"}], "color": "#ff4400", "bold": true}, " ", {"translate": "can only load", "color":"#eb783f", "bold": false}, " ", {"translate": "%1$s%4733088$s","with":["Spectral Arrows",{"translate":"incendium.system.spectral"}], "color":"#eb783f"}] execute if score $failed in.dummy matches 1.. run playsound minecraft:entity.zombie.attack_iron_door player @s ~ ~ ~ 0.5 1.25 @@ -18,5 +18,5 @@ execute store result score $failed in.dummy if entity @s[predicate=incendium:hol execute if score $failed in.dummy matches 1.. run item modify entity @s weapon.offhand incendium:unload execute if score $failed in.dummy matches 1.. run item modify entity @s weapon.offhand incendium:damage -execute if score $failed in.dummy matches 1.. run tellraw @s [{"translate": "Firestorm", "color": "#ff4400", "bold": true}, " ", {"translate": "can only load", "color":"#eb783f", "bold": false}, " ", {"text": "Spectral Arrows", "color":"#eb783f"}] +execute if score $failed in.dummy matches 1.. run tellraw @s [{"translate": "%1$s%4733088$s","with":["Firestorm",{"translate":"incendium.item.firestorm.name"}], "color": "#ff4400", "bold": true}, " ", {"translate": "can only load", "color":"#eb783f", "bold": false}, " ", {"translate": "%1$s%4733088$s","with":["Spectral Arrows",{"translate":"incendium.system.spectral"}], "color":"#eb783f"}] execute if score $failed in.dummy matches 1.. run playsound minecraft:entity.zombie.attack_iron_door player @s ~ ~ ~ 0.5 1.25 diff --git a/data/incendium/functions/item/firestorm/holding.mcfunction b/data/incendium/functions/item/firestorm/holding.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/firestorm/on_shot.mcfunction b/data/incendium/functions/item/firestorm/on_shot.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/firestorm/ray/branch.mcfunction b/data/incendium/functions/item/firestorm/ray/branch.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/firestorm/ray/hit.mcfunction b/data/incendium/functions/item/firestorm/ray/hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/firestorm/ray/hit_chain.mcfunction b/data/incendium/functions/item/firestorm/ray/hit_chain.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/firestorm/ray/iter.mcfunction b/data/incendium/functions/item/firestorm/ray/iter.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/firestorm/ray/start.mcfunction b/data/incendium/functions/item/firestorm/ray/start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/firestorm/shatter.mcfunction b/data/incendium/functions/item/firestorm/shatter.mcfunction old mode 100755 new mode 100644 index e77560b..af78a4f --- a/data/incendium/functions/item/firestorm/shatter.mcfunction +++ b/data/incendium/functions/item/firestorm/shatter.mcfunction @@ -1,6 +1,6 @@ # from (adv): incendium:technical/inventory/firestorm -tellraw @s [{"translate": "Your", "color":"#eb783f"}, " ",{"translate": "Firestorm", "color": "#ff4400", "bold": true}, " ", {"translate": "has shattered after being grindstoned"}] +tellraw @s [{"translate": "%1$s%4733088$s","with":["Firestorm",{"translate":"incendium.item.firestorm.name"}], "color": "#ff4400", "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["has shattered after being used on a Grindstone",{"translate":"incendium.system.shatter"}]}] clear @s crossbow{incendium:{item:'firestorm'}, RepairCost:0} 1 diff --git a/data/incendium/functions/item/greatsword_of_sacrifice/on_hit.mcfunction b/data/incendium/functions/item/greatsword_of_sacrifice/on_hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/hefty_pickaxe/smash.mcfunction b/data/incendium/functions/item/hefty_pickaxe/smash.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/multiplex_crossbow/arrow/helper.mcfunction b/data/incendium/functions/item/multiplex_crossbow/arrow/helper.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/multiplex_crossbow/arrow/init.mcfunction b/data/incendium/functions/item/multiplex_crossbow/arrow/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/multiplex_crossbow/arrow/loop.mcfunction b/data/incendium/functions/item/multiplex_crossbow/arrow/loop.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/multiplex_crossbow/arrow/main.mcfunction b/data/incendium/functions/item/multiplex_crossbow/arrow/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/multiplex_crossbow/arrow/rotate.mcfunction b/data/incendium/functions/item/multiplex_crossbow/arrow/rotate.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/multiplex_crossbow/arrow/rotate/1.mcfunction b/data/incendium/functions/item/multiplex_crossbow/arrow/rotate/1.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/multiplex_crossbow/arrow/rotate/1h.mcfunction b/data/incendium/functions/item/multiplex_crossbow/arrow/rotate/1h.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/multiplex_crossbow/arrow/rotate/2.mcfunction b/data/incendium/functions/item/multiplex_crossbow/arrow/rotate/2.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/multiplex_crossbow/arrow/rotate/3.mcfunction b/data/incendium/functions/item/multiplex_crossbow/arrow/rotate/3.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/multiplex_crossbow/arrow/rotate/4.mcfunction b/data/incendium/functions/item/multiplex_crossbow/arrow/rotate/4.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/multiplex_crossbow/arrow/rotate/5.mcfunction b/data/incendium/functions/item/multiplex_crossbow/arrow/rotate/5.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/multiplex_crossbow/arrow/spawn.mcfunction b/data/incendium/functions/item/multiplex_crossbow/arrow/spawn.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/multiplex_crossbow/on_shot.mcfunction b/data/incendium/functions/item/multiplex_crossbow/on_shot.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/necrotic_shield/on_block.mcfunction b/data/incendium/functions/item/necrotic_shield/on_block.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/patron/daybreaker/on_hit.mcfunction b/data/incendium/functions/item/patron/daybreaker/on_hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/patron/daybreaker/on_kill.mcfunction b/data/incendium/functions/item/patron/daybreaker/on_kill.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/patron/holy_wrath/arrow.mcfunction b/data/incendium/functions/item/patron/holy_wrath/arrow.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/patron/holy_wrath/arrow_init.mcfunction b/data/incendium/functions/item/patron/holy_wrath/arrow_init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/patron/holy_wrath/bomb.mcfunction b/data/incendium/functions/item/patron/holy_wrath/bomb.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/patron/holy_wrath/check_arrow.mcfunction b/data/incendium/functions/item/patron/holy_wrath/check_arrow.mcfunction old mode 100755 new mode 100644 index 5eabb85..647997e --- a/data/incendium/functions/item/patron/holy_wrath/check_arrow.mcfunction +++ b/data/incendium/functions/item/patron/holy_wrath/check_arrow.mcfunction @@ -6,5 +6,5 @@ execute store result score $failed in.dummy if entity @s[predicate=incendium:hol execute if score $failed in.dummy matches 1.. run item modify entity @s weapon.mainhand incendium:unload execute if score $failed in.dummy matches 1.. run item modify entity @s weapon.mainhand incendium:damage -execute if score $failed in.dummy matches 1.. run tellraw @s [{"translate": "Holy Wrath", "color": "#ffee77", "bold": true}, " ", {"translate": "can only load", "color":"#ccbb88", "bold": false}, " ", {"text": "Spectral Arrows", "color":"#ccbb88"}] +execute if score $failed in.dummy matches 1.. run tellraw @s [{"translate": "%1$s%4733088$s","with":["Holy Wrath",{"translate":"incendium.item.holy_wrath.name"}], "color": "#ffee77", "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["can only load",{"translate":"incendium.system.only_load"}], "color":"#ccbb88", "bold": false}, " ", {"translate": "%1$s%4733088$s","with":["Spectral Arrows",{"translate":"incendium.system.spectral"}], "color":"#ccbb88"}] execute if score $failed in.dummy matches 1.. run playsound minecraft:entity.zombie.attack_iron_door player @s ~ ~ ~ 0.5 1.25 \ No newline at end of file diff --git a/data/incendium/functions/item/patron/holy_wrath/explode.mcfunction b/data/incendium/functions/item/patron/holy_wrath/explode.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/patron/holy_wrath/fireball.mcfunction b/data/incendium/functions/item/patron/holy_wrath/fireball.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/patron/holy_wrath/fireball_explode.mcfunction b/data/incendium/functions/item/patron/holy_wrath/fireball_explode.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/patron/holy_wrath/fireball_init.mcfunction b/data/incendium/functions/item/patron/holy_wrath/fireball_init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/patron/holy_wrath/kick.mcfunction b/data/incendium/functions/item/patron/holy_wrath/kick.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/patron/holy_wrath/on_shot.mcfunction b/data/incendium/functions/item/patron/holy_wrath/on_shot.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/patron/scroll_of_returning/activate.mcfunction b/data/incendium/functions/item/patron/scroll_of_returning/activate.mcfunction old mode 100755 new mode 100644 index e13f217..9f16620 --- a/data/incendium/functions/item/patron/scroll_of_returning/activate.mcfunction +++ b/data/incendium/functions/item/patron/scroll_of_returning/activate.mcfunction @@ -30,7 +30,7 @@ tag @s add in.self # # teleport player # execute in minecraft:overworld positioned 0.0 0.0 0.0 as @e[type=marker,tag=in.helper_entity,distance=..10] run function incendium:item/patron/scroll_of_returning/coords -tellraw @s {"text": "Woosh..! A familiar place awaits.", "italic": true, "color": "#D393F5"} +tellraw @s {"translate": "%1$s%4733088$s","with":["Whoosh! A familiar place awaits.",{"translate":"incendium.item.returning_scroll.system.whoosh"}], "italic": true, "color": "#D393F5"} # particles before tping particle minecraft:large_smoke ~ ~ ~ 0 0 0 0.1 50 diff --git a/data/incendium/functions/item/patron/scroll_of_returning/crumble.mcfunction b/data/incendium/functions/item/patron/scroll_of_returning/crumble.mcfunction index 13be728..2ecae15 100644 --- a/data/incendium/functions/item/patron/scroll_of_returning/crumble.mcfunction +++ b/data/incendium/functions/item/patron/scroll_of_returning/crumble.mcfunction @@ -2,9 +2,9 @@ # @s: player who used scroll # $rand is set beforehand in activate or fail functions, since the probabilities are reversed -execute if score $rand in.dummy matches 1.. run tellraw @s {"text": "The ancient technique withstood itself, this time...", "italic": true, "color": "#D393F5"} +execute if score $rand in.dummy matches 1.. run tellraw @s {"translate": "%1$s%4733088$s","with":["The ancient technique withstood itself, this time...",{"translate":"incendium.item.returning_scroll.system.withstood"}], "italic": true, "color": "#D393F5"} execute if score $rand in.dummy matches 1.. run loot replace entity @s[tag=in.mainhand_scroll] weapon.mainhand loot incendium:artifact/patron/scroll_of_returning execute if score $rand in.dummy matches 1.. run loot replace entity @s[tag=in.offhand_scroll] weapon.offhand loot incendium:artifact/patron/scroll_of_returning -execute unless score $rand in.dummy matches 1.. run tellraw @s {"text": "The ancient technique crumbled upon usage", "italic": true, "color": "#D393F5"} \ No newline at end of file +execute unless score $rand in.dummy matches 1.. run tellraw @s {"translate": "%1$s%4733088$s","with":["The ancient technique crumbled upon usage",{"translate":"incendium.item.returning_scroll.system.crumble"}], "italic": true, "color": "#D393F5"} \ No newline at end of file diff --git a/data/incendium/functions/item/patron/scroll_of_returning/fail.mcfunction b/data/incendium/functions/item/patron/scroll_of_returning/fail.mcfunction old mode 100755 new mode 100644 index 66c26e8..314e27f --- a/data/incendium/functions/item/patron/scroll_of_returning/fail.mcfunction +++ b/data/incendium/functions/item/patron/scroll_of_returning/fail.mcfunction @@ -1,7 +1,7 @@ # from: ./use # @s: player failed to teleport -tellraw @s {"text": "The scroll of returning only understands the Nether Dimension!", "italic": true, "color": "#D393F5"} +tellraw @s {"translate": "%1$s%4733088$s","with":["The Scroll of Returning only understands the Nether dimension!",{"translate":"incendium.item.returning_scroll.system.fail"}], "italic": true, "color": "#D393F5"} execute store result score $rand in.dummy if predicate incendium:random/70 function incendium:item/patron/scroll_of_returning/crumble \ No newline at end of file diff --git a/data/incendium/functions/item/patron/scroll_of_returning/use.mcfunction b/data/incendium/functions/item/patron/scroll_of_returning/use.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/patron/warping_witherblade/on_hit.mcfunction b/data/incendium/functions/item/patron/warping_witherblade/on_hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/on_block.mcfunction b/data/incendium/functions/item/prismatic_shield/on_block.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/attack.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/attack.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/hit.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/hit/1.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/hit/1.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/hit/2.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/hit/2.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/hit/3.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/hit/3.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/hit/4.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/hit/4.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/hit/5.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/hit/5.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/hit/6.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/hit/6.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/hit/7.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/hit/7.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/iter.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/iter.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/iter/1.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/iter/1.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/iter/2.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/iter/2.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/iter/3.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/iter/3.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/iter/4.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/iter/4.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/iter/5.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/iter/5.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/iter/6.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/iter/6.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/iter/7.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/iter/7.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/start.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/start/1.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/start/1.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/start/2.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/start/2.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/start/3.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/start/3.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/start/4.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/start/4.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/start/5.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/start/5.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/start/6.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/start/6.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/prismatic_shield/ray/start/7.mcfunction b/data/incendium/functions/item/prismatic_shield/ray/start/7.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/radiation_shield/on_block.mcfunction b/data/incendium/functions/item/radiation_shield/on_block.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/ragnarok/fail.mcfunction b/data/incendium/functions/item/ragnarok/fail.mcfunction old mode 100755 new mode 100644 index ce70df0..a174664 --- a/data/incendium/functions/item/ragnarok/fail.mcfunction +++ b/data/incendium/functions/item/ragnarok/fail.mcfunction @@ -1,7 +1,7 @@ # from ./shot # @s: player -tellraw @s [{"translate": "Ragnarok", "color": "#CCEBDB", "bold": true}, " ", {"translate": "cannot be rapid fired", "color":"#ABC4B8", "bold": false}] +tellraw @s [{"translate": "%1$s%4733088$s","with":["Ragnarok",{"translate":"incendium.item.ragnarok.name"}], "color": "#CCEBDB", "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["cannot be rapid fired",{"translate":"incendium.item.ragnarok.system.fail"}], "color":"#ABC4B8", "bold": false}] summon minecraft:firework_rocket ~ ~1 ~ {Silent:1b,Motion:[0.0,-0.25,0.0],ShotAtAngle:1,LifeTime:0,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Flight:1,Explosions:[{Type:4,Flicker:0,Trail:0,Colors:[I;10483711]},{Type:4,Flicker:0,Trail:0,Colors:[I;10476799]},{Type:4,Flicker:0,Trail:0,Colors:[I;10994687]},{Type:4,Flicker:0,Trail:0,Colors:[I;10991615]},{Type:4,Flicker:0,Trail:0,Colors:[I;9603583]}]}}},Tags:["in.ragnarok_firework"]} diff --git a/data/incendium/functions/item/ragnarok/fix.mcfunction b/data/incendium/functions/item/ragnarok/fix.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/ragnarok/lightning/branch.mcfunction b/data/incendium/functions/item/ragnarok/lightning/branch.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/ragnarok/lightning/branch_straight.mcfunction b/data/incendium/functions/item/ragnarok/lightning/branch_straight.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/ragnarok/lightning/hit_entity.mcfunction b/data/incendium/functions/item/ragnarok/lightning/hit_entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/ragnarok/lightning/hit_entity_chain.mcfunction b/data/incendium/functions/item/ragnarok/lightning/hit_entity_chain.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/ragnarok/lightning/ray.mcfunction b/data/incendium/functions/item/ragnarok/lightning/ray.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/ragnarok/lightning/start_ray.mcfunction b/data/incendium/functions/item/ragnarok/lightning/start_ray.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/ragnarok/loop.mcfunction b/data/incendium/functions/item/ragnarok/loop.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/ragnarok/marker.mcfunction b/data/incendium/functions/item/ragnarok/marker.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/ragnarok/on_unload.mcfunction b/data/incendium/functions/item/ragnarok/on_unload.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/ragnarok/ray.mcfunction b/data/incendium/functions/item/ragnarok/ray.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/ragnarok/shot.mcfunction b/data/incendium/functions/item/ragnarok/shot.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/ragnarok/unstable.mcfunction b/data/incendium/functions/item/ragnarok/unstable.mcfunction old mode 100755 new mode 100644 index 6761fb8..d8a923c --- a/data/incendium/functions/item/ragnarok/unstable.mcfunction +++ b/data/incendium/functions/item/ragnarok/unstable.mcfunction @@ -9,6 +9,6 @@ scoreboard players operation $random in.dummy < #75 in.constants execute if predicate incendium:random/other/x if predicate incendium:random/other/x if predicate incendium:random/10 run summon lightning_bolt -title @s[predicate=!incendium:weather/thunder] actionbar [{"translate": "Ragnarok", "color": "#CCEBDB", "bold": true}, " ", {"translate": "is becoming unstable the longer you hold it's power within", "color":"#ABC4B8", "bold": false}] +title @s[predicate=!incendium:weather/thunder] actionbar [{"translate": "%1$s%4733088$s","with":["Ragnarok",{"translate":"incendium.item.ragnarok.name"}], "color": "#CCEBDB", "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["is becoming unstable the longer you hold it's power within",{"translate":"incendium.item.ragnarok.system.unstable"}], "color":"#ABC4B8", "bold": false}] -title @s[predicate=incendium:weather/thunder] actionbar [{"translate": "Ragnarok", "color": "#CCEBDB", "bold": true}, " ", {"translate": "is becoming more unstable during the storm", "color":"#ABC4B8", "bold": false}] +title @s[predicate=incendium:weather/thunder] actionbar [{"translate": "%1$s%4733088$s","with":["Ragnarok",{"translate":"incendium.item.ragnarok.name"}], "color": "#CCEBDB", "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["is becoming more unstable during the storm",{"translate":"incendium.item.ragnarok.system.storm"}], "color":"#ABC4B8", "bold": false}] diff --git a/data/incendium/functions/item/ragnarok/update.mcfunction b/data/incendium/functions/item/ragnarok/update.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/ragnarok/using.mcfunction b/data/incendium/functions/item/ragnarok/using.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/restless_nature/init.mcfunction b/data/incendium/functions/item/restless_nature/init.mcfunction index 4252d06..829fd57 100644 --- a/data/incendium/functions/item/restless_nature/init.mcfunction +++ b/data/incendium/functions/item/restless_nature/init.mcfunction @@ -1,7 +1,7 @@ # from: player/main stopsound @a[distance=..16] * entity.snowball.throw -playsound minecraft:entity.wither.shoot player @a[distance=..16] ~ ~ ~ .8 1.5 +playsound minecraft:entity.wither.shoot player @a[distance=..16] ~ ~ ~ .5 1.5 tag @s add in.restless_nature tag @s add in.checked diff --git a/data/incendium/functions/item/restless_nature/place.mcfunction b/data/incendium/functions/item/restless_nature/place.mcfunction index e938358..5418cce 100644 --- a/data/incendium/functions/item/restless_nature/place.mcfunction +++ b/data/incendium/functions/item/restless_nature/place.mcfunction @@ -1,10 +1,10 @@ # from: ./main -place feature incendium:ash_barrens/tree_bend +execute store result score @s in.dummy run place feature incendium:ash_barrens/tree_bend -particle minecraft:block minecraft:soul_sand ~ ~-.5 ~ .8 .125 .8 1 15 normal -particle minecraft:block minecraft:soul_sand ~ ~-.5 ~ .8 .125 .8 1 15 normal +execute if score @s in.dummy matches 1 run particle minecraft:block minecraft:soul_sand ~ ~-.5 ~ .8 .125 .8 1 15 normal +execute if score @s in.dummy matches 1 run particle minecraft:block minecraft:soul_sand ~ ~-.5 ~ .8 .125 .8 1 15 normal -playsound minecraft:block.fungus.place block @a[distance=..16] ~ ~ ~ 1 0.85 -playsound minecraft:block.fungus.place block @a[distance=..16] ~ ~ ~ 1 1.0 -playsound minecraft:block.fungus.place block @a[distance=..16] ~ ~ ~ 1 1.15 \ No newline at end of file +execute if score @s in.dummy matches 1 run playsound minecraft:block.fungus.place block @a[distance=..16] ~ ~ ~ 1 0.85 +execute if score @s in.dummy matches 1 run playsound minecraft:block.fungus.place block @a[distance=..16] ~ ~ ~ 1 1.0 +execute if score @s in.dummy matches 1 run playsound minecraft:block.fungus.place block @a[distance=..16] ~ ~ ~ 1 1.15 \ No newline at end of file diff --git a/data/incendium/functions/item/scarlet_dagger/on_hit.mcfunction b/data/incendium/functions/item/scarlet_dagger/on_hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/scouts_battle_helm/helper.mcfunction b/data/incendium/functions/item/scouts_battle_helm/helper.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/scouts_battle_helm/main.mcfunction b/data/incendium/functions/item/scouts_battle_helm/main.mcfunction old mode 100755 new mode 100644 index 426fbb9..d197404 --- a/data/incendium/functions/item/scouts_battle_helm/main.mcfunction +++ b/data/incendium/functions/item/scouts_battle_helm/main.mcfunction @@ -12,4 +12,4 @@ scoreboard players set @s[scores={in.scouts_helmet=360..}] in.scouts_helmet 0 scoreboard players operation $scouts_helmet in.dummy = @s in.scouts_helmet # uses marker for rotation but displays particle at player position -execute unless entity @s[tag=in.invis] run execute anchored eyes positioned ^ ^ ^ as @e[type=marker,tag=in.helper_entity,limit=1] run function incendium:item/scouts_battle_helm/helper +execute unless entity @s[tag=in.invis] unless entity @s[gamemode=spectator] run execute anchored eyes positioned ^ ^ ^ as @e[type=marker,tag=in.helper_entity,limit=1] run function incendium:item/scouts_battle_helm/helper diff --git a/data/incendium/functions/item/scouts_battle_helm/update.mcfunction b/data/incendium/functions/item/scouts_battle_helm/update.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/sentrys_wrath/check_arrow.mcfunction b/data/incendium/functions/item/sentrys_wrath/check_arrow.mcfunction old mode 100755 new mode 100644 index ad3f482..0623267 --- a/data/incendium/functions/item/sentrys_wrath/check_arrow.mcfunction +++ b/data/incendium/functions/item/sentrys_wrath/check_arrow.mcfunction @@ -7,7 +7,7 @@ execute store result score $failed in.dummy if entity @s[predicate=incendium:hol execute if score $failed in.dummy matches 1.. run item modify entity @s weapon.mainhand incendium:unload execute if score $failed in.dummy matches 1.. run item modify entity @s weapon.mainhand incendium:damage -execute if score $failed in.dummy matches 1.. run tellraw @s [{"translate": "Sentry's Wrath", "color": "#33ccff", "bold": true}, " ", {"text": "can only load", "color": "#0077bb", "bold": true}, " ", {"text": "Spectral Arrows", "color": "#0077bb"}] +execute if score $failed in.dummy matches 1.. run tellraw @s [{"translate": "%1$s%4733088$s","with":["Sentry's Wrath",{"translate":"incendium.item.sentrys_wrath.name"}], "color": "#33ccff", "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["can only load",{"translate":"incendium.system.only_load"}], "color": "#0077bb", "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["Spectral Arrows",{"translate":"incendium.system.spectral"}], "color": "#0077bb"}] ## Offhand # check if loaded crossbow has correct arrow type @@ -15,4 +15,4 @@ execute store result score $failed in.dummy if entity @s[predicate=incendium:hol execute if score $failed in.dummy matches 1.. run item modify entity @s weapon.offhand incendium:unload execute if score $failed in.dummy matches 1.. run item modify entity @s weapon.offhand incendium:damage -execute if score $failed in.dummy matches 1.. run tellraw @s [{"translate": "Sentry's Wrath", "color": "#33ccff", "bold": true}, " ", {"text": "can only load", "color": "#0077bb", "bold": true}, " ", {"text": "Spectral Arrows", "color": "#0077bb"}] +execute if score $failed in.dummy matches 1.. run tellraw @s [{"translate": "%1$s%4733088$s","with":["Sentry's Wrath",{"translate":"incendium.item.sentrys_wrath.name"}], "color": "#33ccff", "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["can only load",{"translate":"incendium.system.only_load"}], "color": "#0077bb", "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["Spectral Arrows",{"translate":"incendium.system.spectral"}], "color": "#0077bb"}] diff --git a/data/incendium/functions/item/sentrys_wrath/explode.mcfunction b/data/incendium/functions/item/sentrys_wrath/explode.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/sentrys_wrath/fail.mcfunction b/data/incendium/functions/item/sentrys_wrath/fail.mcfunction old mode 100755 new mode 100644 index 3fe6758..d27cce1 --- a/data/incendium/functions/item/sentrys_wrath/fail.mcfunction +++ b/data/incendium/functions/item/sentrys_wrath/fail.mcfunction @@ -1,7 +1,7 @@ # from: ./on_shot # @s: player -title @s actionbar ["", {"translate": "Sentry's Wrath", "color": "#33ccff", "bold": true}, " ", {"translate": "is still in cooldown", "color": "#0077bb"}] +title @s actionbar ["", {"translate": "%1$s%4733088$s","with":["Sentry's Wrath",{"translate":"incendium.item.sentrys_wrath.name"}], "color": "#33ccff", "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["is still on cooldown",{"translate":"incendium.system.cooldown"}], "color": "#0077bb"}] playsound minecraft:block.fire.extinguish master @s ~ ~ ~ 1 2 function incendium:item/sentrys_wrath/explode diff --git a/data/incendium/functions/item/sentrys_wrath/holding.mcfunction b/data/incendium/functions/item/sentrys_wrath/holding.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/sentrys_wrath/init.mcfunction b/data/incendium/functions/item/sentrys_wrath/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/sentrys_wrath/kick.mcfunction b/data/incendium/functions/item/sentrys_wrath/kick.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/sentrys_wrath/marker.mcfunction b/data/incendium/functions/item/sentrys_wrath/marker.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/sentrys_wrath/on_shot.mcfunction b/data/incendium/functions/item/sentrys_wrath/on_shot.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/sentrys_wrath/shatter.mcfunction b/data/incendium/functions/item/sentrys_wrath/shatter.mcfunction old mode 100755 new mode 100644 index ce6f61f..8524c56 --- a/data/incendium/functions/item/sentrys_wrath/shatter.mcfunction +++ b/data/incendium/functions/item/sentrys_wrath/shatter.mcfunction @@ -1,6 +1,6 @@ # from (adv): incendium:technical/inventory/firestorm -tellraw @s [{"translate": "Your", "color":"#0077bb"}, " ",{"translate": "Sentry's Wrath", "color": "#33ccff", "bold": true}, " ", {"translate": "has shattered after being grindstoned"}] +tellraw @s [{"translate": "%1$s%4733088$s","with":["Sentry's Wrath",{"translate":"incendium.item.sentrys_wrath.name"}], "color": "#33ccff", "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["has shattered after being used on a Grindstone",{"translate":"incendium.system.shatter"}]}] clear @s crossbow{incendium:{item:'sentrys_wrath'}, RepairCost:0} 1 diff --git a/data/incendium/functions/item/sentrys_wrath/short_lightning/branch.mcfunction b/data/incendium/functions/item/sentrys_wrath/short_lightning/branch.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/sentrys_wrath/short_lightning/branch_obs.mcfunction b/data/incendium/functions/item/sentrys_wrath/short_lightning/branch_obs.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/sentrys_wrath/short_lightning/hit_entity.mcfunction b/data/incendium/functions/item/sentrys_wrath/short_lightning/hit_entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/sentrys_wrath/short_lightning/hit_entity_chain.mcfunction b/data/incendium/functions/item/sentrys_wrath/short_lightning/hit_entity_chain.mcfunction old mode 100755 new mode 100644 index 1e8db8c..9785085 --- a/data/incendium/functions/item/sentrys_wrath/short_lightning/hit_entity_chain.mcfunction +++ b/data/incendium/functions/item/sentrys_wrath/short_lightning/hit_entity_chain.mcfunction @@ -4,6 +4,7 @@ tag @s add laser #execute rotated as @s positioned ~0.5 ~1 ~0.5 run #execute as @e[distance=..4,limit=1] at @s facing entity @e[type=blaze,tag=sentry,tag=attacking,sort=nearest,limit=1,distance=..50] eyes run execute at @s run summon minecraft:firework_rocket ~ ~1 ~ {Silent:1b,Motion:[0.0,0.0,0.0],ShotAtAngle:1,LifeTime:0,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Flight:1,Explosions:[{Type:4,Flicker:0,Trail:0,Colors:[I;39679]}]}}},Tags:["in.sentrys_wrath_firework"]} +execute if entity @e[type=blaze,tag=in.sentry,distance=..5] run advancement grant @p[distance=..30,tag=in.self] only incendium:ash_barrens/duel_of_the_fates execute at @s positioned ~ ~1 ~ if score #hit in.fire_laser matches 0 if predicate incendium:random/85 if score #distance2 in.fire_laser matches 0..250 positioned ^ ^ ^0.2 facing entity @e[type=#incendium:mobs_no_player,tag=!laser,distance=..10,sort=nearest,limit=1] eyes if block ~ ~ ~ #incendium:airs run function incendium:item/sentrys_wrath/short_lightning/ray #execute if predicate incendium:random/50 run data merge entity @s {Fire:80s} diff --git a/data/incendium/functions/item/sentrys_wrath/short_lightning/ray.mcfunction b/data/incendium/functions/item/sentrys_wrath/short_lightning/ray.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/sentrys_wrath/short_lightning/start_ray.mcfunction b/data/incendium/functions/item/sentrys_wrath/short_lightning/start_ray.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/sentrys_wrath/summon.mcfunction b/data/incendium/functions/item/sentrys_wrath/summon.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/trailblazer/arrow/explode.mcfunction b/data/incendium/functions/item/trailblazer/arrow/explode.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/trailblazer/arrow/init.mcfunction b/data/incendium/functions/item/trailblazer/arrow/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/trailblazer/arrow/main.mcfunction b/data/incendium/functions/item/trailblazer/arrow/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/trailblazer/arrow/water.mcfunction b/data/incendium/functions/item/trailblazer/arrow/water.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/trailblazer/fail.mcfunction b/data/incendium/functions/item/trailblazer/fail.mcfunction old mode 100755 new mode 100644 index 318374d..51db2a3 --- a/data/incendium/functions/item/trailblazer/fail.mcfunction +++ b/data/incendium/functions/item/trailblazer/fail.mcfunction @@ -1,7 +1,7 @@ # from ./shot # @s: player -tellraw @s [{"translate": "Trailblazer", "color": "#F7823E", "bold": true}, " ", {"translate": "requires a fully drawn back bow to function", "color":"#C46731", "bold": false}] +tellraw @s [{"translate": "%1$s%4733088$s","with":["Trailblazer",{"translate":"incendium.item.trailblazer.name"}], "color": "#F7823E", "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["requires a fully drawn back bow to function",{"translate":"incendium.item.trailblazer.system.fail"}], "color":"#C46731", "bold": false}] execute anchored eyes run summon firework_rocket ^ ^ ^0.25 {LifeTime:1,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Flight:2,Explosions:[{Type:0,Flicker:1,Trail:0,Colors:[I;11743532,15435844],FadeColors:[I;14602026,15435844]},{Type:0,Flicker:1,Trail:0,Colors:[I;11743532,15435844],FadeColors:[I;14602026,15435844]}]}}}} execute anchored eyes run summon firework_rocket ^ ^ ^0.25 {LifeTime:1,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Flight:2,Explosions:[{Type:0,Flicker:1,Trail:0,Colors:[I;11743532,15435844],FadeColors:[I;14602026,15435844]},{Type:0,Flicker:1,Trail:0,Colors:[I;11743532,15435844],FadeColors:[I;14602026,15435844]}]}}}} diff --git a/data/incendium/functions/item/trailblazer/fix.mcfunction b/data/incendium/functions/item/trailblazer/fix.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/trailblazer/on_hit.mcfunction b/data/incendium/functions/item/trailblazer/on_hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/trailblazer/on_unload.mcfunction b/data/incendium/functions/item/trailblazer/on_unload.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/trailblazer/shot.mcfunction b/data/incendium/functions/item/trailblazer/shot.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/trailblazer/update.mcfunction b/data/incendium/functions/item/trailblazer/update.mcfunction old mode 100755 new mode 100644 index 7dbfee7..813b0da --- a/data/incendium/functions/item/trailblazer/update.mcfunction +++ b/data/incendium/functions/item/trailblazer/update.mcfunction @@ -34,11 +34,4 @@ execute store result storage incendium:temp bow.CustomModelData int 1 run scoreb item modify entity @s[scores={in.trailblazer=40..},predicate=incendium:holding/trailblazer/mainhand] weapon.mainhand incendium:trailblazer/update item modify entity @s[scores={in.trailblazer=40..},predicate=incendium:holding/trailblazer/offhand] weapon.offhand incendium:trailblazer/update - -# execute store result score $attr in.dummy run attribute @s minecraft:generic.movement_speed get 1000 - -# tellraw @a {"score": {"name": "$zoom", "objective": "in.dummy"}} -# tellraw @a {"score": {"name": "$attr", "objective": "in.dummy"}} -# tellraw @a "" - tag @s add in.trailblazer_fix diff --git a/data/incendium/functions/item/trailblazer/using.mcfunction b/data/incendium/functions/item/trailblazer/using.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/trailblazer/using/while_wet.mcfunction b/data/incendium/functions/item/trailblazer/using/while_wet.mcfunction old mode 100755 new mode 100644 index 6d562bf..e1c6ca1 --- a/data/incendium/functions/item/trailblazer/using/while_wet.mcfunction +++ b/data/incendium/functions/item/trailblazer/using/while_wet.mcfunction @@ -1,7 +1,7 @@ # from: player/main # @s: player using trailblazer while wet lol -title @s actionbar [{"translate":"Your", "color":"#C46731"}, " ", {"translate": "Trailblazer", "color": "#F7823E", "bold": true}, " ", {"translate": "is still wet and cannot function"}] +title @s actionbar [{"translate": "%1$s%4733088$s","with":["Trailblazer",{"translate":"incendium.item.trailblazer.name"}], "color": "#F7823E", "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["is still wet and cannot function",{"translate":"incendium.item.trailblazer.system.still_wet"}]}] execute if predicate incendium:random/0_5 run playsound minecraft:entity.generic.extinguish_fire master @a ~ ~ ~ 2 0.1 execute if predicate incendium:random/0_5 run playsound minecraft:entity.generic.extinguish_fire master @a ~ ~ ~ 2 0.5 diff --git a/data/incendium/functions/item/trailblazer/wet.mcfunction b/data/incendium/functions/item/trailblazer/wet.mcfunction old mode 100755 new mode 100644 index a848aba..14ea78e --- a/data/incendium/functions/item/trailblazer/wet.mcfunction +++ b/data/incendium/functions/item/trailblazer/wet.mcfunction @@ -3,7 +3,7 @@ scoreboard players set @s in.wet 300 scoreboard players set @s in.trailblazer 0 -tellraw @s [{"translate":"Your", "color":"#C46731"}, " ", {"translate": "Trailblazer", "color": "#F7823E", "bold": true}, " ", {"translate": "has become wet. You must dry it off before using it again"}] +tellraw @s [{"translate": "%1$s%4733088$s","with":["Trailblazer",{"translate":"incendium.item.trailblazer.name"}], "color": "#F7823E", "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["has become wet. You must dry it off before using it again",{"translate":"incendium.item.trailblazer.system.wet"}]}] function incendium:item/trailblazer/fix diff --git a/data/incendium/functions/item/unstable_powder/explode.mcfunction b/data/incendium/functions/item/unstable_powder/explode.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/unstable_powder/init.mcfunction b/data/incendium/functions/item/unstable_powder/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/damage.mcfunction b/data/incendium/functions/item/voltaic_trident/damage.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/dna/ray.mcfunction b/data/incendium/functions/item/voltaic_trident/dna/ray.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/dna/start_ray.mcfunction b/data/incendium/functions/item/voltaic_trident/dna/start_ray.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode.mcfunction b/data/incendium/functions/item/voltaic_trident/explode.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/boom.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/boom.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/init.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/lightning/2t.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/lightning/2t.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/lightning/branch.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/lightning/branch.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/lightning/branch_straight.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/lightning/branch_straight.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/lightning/hit_entity.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/lightning/hit_entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/lightning/hit_entity_chain.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/lightning/hit_entity_chain.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/lightning/kick.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/lightning/kick.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/lightning/random_start.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/lightning/random_start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/lightning/ray.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/lightning/ray.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/lightning/start_ray.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/lightning/start_ray.mcfunction old mode 100755 new mode 100644 index f69abd2..5f79c38 --- a/data/incendium/functions/item/voltaic_trident/explode/lightning/start_ray.mcfunction +++ b/data/incendium/functions/item/voltaic_trident/explode/lightning/start_ray.mcfunction @@ -4,7 +4,7 @@ scoreboard players set #distance in.fire_laser 0 scoreboard players set #distance2 in.fire_laser 0 execute positioned ~ ~1 ~ run function incendium:item/voltaic_trident/explode/lightning/ray -#tellraw @a [{"text":"D2 Is: "},{"score":{"name":"#distance2","objective":"in.fire_laser"}}] + tag @s remove laser kill @s[type=area_effect_cloud] diff --git a/data/incendium/functions/item/voltaic_trident/explode/lightning/stop.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/lightning/stop.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/loop.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/loop.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/rotate/0.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/rotate/0.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/rotate/1.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/rotate/1.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/rotate/2.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/rotate/2.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/rotate/3.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/rotate/3.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/rotate/4.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/rotate/4.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/rotate/5.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/rotate/5.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/rotate/rand.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/rotate/rand.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/rotate/start.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/rotate/start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/explode/tick.mcfunction b/data/incendium/functions/item/voltaic_trident/explode/tick.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/holding.mcfunction b/data/incendium/functions/item/voltaic_trident/holding.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/init.mcfunction b/data/incendium/functions/item/voltaic_trident/init.mcfunction old mode 100755 new mode 100644 index b270fa8..9e062ad --- a/data/incendium/functions/item/voltaic_trident/init.mcfunction +++ b/data/incendium/functions/item/voltaic_trident/init.mcfunction @@ -13,7 +13,7 @@ execute store result score @s in.trident_id run scoreboard players add $latest.i execute store result score @s in.dummy if data entity @s Trident.tag.Enchantments[{id:"minecraft:channeling"}] execute if entity @s[scores={in.dummy=1..}] run summon lightning_bolt -execute if entity @s[scores={in.dummy=1..}] run tellraw @p[tag=in.self] ["", {"translate": "Volatic Trident", "color": "#8844ff", "bold": true}, " ", {"translate": "struggles to be stable with the channeling enchant", "color": "#4400aa"}] +execute if entity @s[scores={in.dummy=1..}] run tellraw @p[tag=in.self] ["", {"translate": "%1$s%4733088$s","with":["Voltaic Trident",{"translate":"incendium.item.voltaic_trident.name"}], "color": "#8844ff", "bold": true}, " ", {"translate": "%1$s%4733088$s","with":["struggles to be stable with the channeling enchantment",{"translate":"incendium.item.voltaic_trident.system.unstable"}], "color": "#4400aa"}] data modify entity @s[scores={in.dummy=..0}] Trident.tag.player_uuid set from storage incendium:temp player.UUID diff --git a/data/incendium/functions/item/voltaic_trident/lightning.mcfunction b/data/incendium/functions/item/voltaic_trident/lightning.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/main.mcfunction b/data/incendium/functions/item/voltaic_trident/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/on_throw.mcfunction b/data/incendium/functions/item/voltaic_trident/on_throw.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/voltaic_trident/rotate.mcfunction b/data/incendium/functions/item/voltaic_trident/rotate.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/warping_witherblade/on_hit.mcfunction b/data/incendium/functions/item/warping_witherblade/on_hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/warping_witherblade/success.mcfunction b/data/incendium/functions/item/warping_witherblade/success.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/withersbane/effects.mcfunction b/data/incendium/functions/item/withersbane/effects.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/withersbane/on_hit.mcfunction b/data/incendium/functions/item/withersbane/on_hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/withersbane/ray/hit.mcfunction b/data/incendium/functions/item/withersbane/ray/hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/withersbane/ray/iter.mcfunction b/data/incendium/functions/item/withersbane/ray/iter.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/item/withersbane/ray/start.mcfunction b/data/incendium/functions/item/withersbane/ray/start.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/load.mcfunction b/data/incendium/functions/load.mcfunction old mode 100755 new mode 100644 index b4cf0d2..68a3b82 --- a/data/incendium/functions/load.mcfunction +++ b/data/incendium/functions/load.mcfunction @@ -37,6 +37,7 @@ scoreboard objectives add in.frozen dummy scoreboard objectives add in.shielding dummy scoreboard objectives add in.use_map minecraft.used:minecraft.map scoreboard objectives add in.use_snowball minecraft.used:minecraft.snowball +scoreboard objectives add in.restless_nature dummy scoreboard objectives add in.scouts_helmet dummy scoreboard objectives add in.castle_id dummy @@ -106,6 +107,8 @@ team modify in.noname nametagVisibility never team modify in.noname color yellow scoreboard players set %shulker.steps in.constants 30 +scoreboard players set $sentry_lives in.dummy 0 +scoreboard objectives add in.sentry_totems dummy # gamerules execute store result score %mob.griefing in.constants run gamerule mobGriefing diff --git a/data/incendium/functions/misc/aim.mcfunction b/data/incendium/functions/misc/aim.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/misc/aim/helper.mcfunction b/data/incendium/functions/misc/aim/helper.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/misc/firework.mcfunction b/data/incendium/functions/misc/firework.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/misc/store_uuid.mcfunction b/data/incendium/functions/misc/store_uuid.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/player/1s.mcfunction b/data/incendium/functions/player/1s.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/player/advancements/1s.mcfunction b/data/incendium/functions/player/advancements/1s.mcfunction old mode 100755 new mode 100644 index a399086..c265c87 --- a/data/incendium/functions/player/advancements/1s.mcfunction +++ b/data/incendium/functions/player/advancements/1s.mcfunction @@ -1,7 +1,7 @@ # from: player/1s # @s: player -# advancement grant @s[scores={in.mine_debris=1..},predicate=incendium:other/hidden_debris] only incendium:volcaic_deltas/hidden_debris +advancement grant @s[scores={in.mine_debris=1..},predicate=incendium:other/hidden_debris] only incendium:volcanic_deltas/hidden_debris execute if entity @s[predicate=incendium:structure/forbidden_castle] unless entity @e[type=piglin_brute,tag=in.castle,distance=..160] run advancement grant @s only incendium:ash_barrens/conquer_castle diff --git a/data/incendium/functions/player/event/on_block.mcfunction b/data/incendium/functions/player/event/on_block.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/player/event/on_effect_change.mcfunction b/data/incendium/functions/player/event/on_effect_change.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/player/event/on_hit.mcfunction b/data/incendium/functions/player/event/on_hit.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/player/event/on_hit/entity.mcfunction b/data/incendium/functions/player/event/on_hit/entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/player/event/on_hit/find_entity.mcfunction b/data/incendium/functions/player/event/on_hit/find_entity.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/player/event/on_hit_or_kill.mcfunction b/data/incendium/functions/player/event/on_hit_or_kill.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/player/event/on_inventory_change.mcfunction b/data/incendium/functions/player/event/on_inventory_change.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/player/event/on_kill.mcfunction b/data/incendium/functions/player/event/on_kill.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/player/event/shielding.mcfunction b/data/incendium/functions/player/event/shielding.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/player/init.mcfunction b/data/incendium/functions/player/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/player/main.mcfunction b/data/incendium/functions/player/main.mcfunction old mode 100755 new mode 100644 index 73fd828..7ced123 --- a/data/incendium/functions/player/main.mcfunction +++ b/data/incendium/functions/player/main.mcfunction @@ -72,10 +72,10 @@ execute if entity @s[scores={in.ragnarok=1..}, advancements={incendium:technical execute if entity @s[advancements={incendium:technical/using/ragnarok=true}] run function incendium:item/ragnarok/using # restless nature -execute if entity @s[predicate=incendium:holding/restless_nature,predicate=incendium:dimension/nether] run tag @s add in.restless -execute if entity @s[scores={in.use_snowball=1..},tag=in.restless] run execute as @e[type=snowball,distance=..2,limit=1,sort=nearest] run function incendium:item/restless_nature/init +execute if entity @s[predicate=incendium:holding/restless_nature,predicate=incendium:dimension/nether] run scoreboard players set @s in.restless_nature 5 +execute if entity @s[scores={in.use_snowball=1..,in.restless_nature=1..}] run execute as @e[type=snowball,distance=..2,limit=1,sort=nearest] run function incendium:item/restless_nature/init +execute if entity @s[scores={in.restless_nature=1..}] run scoreboard players remove @s in.restless_nature 1 scoreboard players set @s in.use_snowball 0 -tag @s remove in.restless # scroll of returning execute if entity @s[scores={in.use_map=1..},tag=in.scroll] run function incendium:item/patron/scroll_of_returning/use diff --git a/data/incendium/functions/sanctum/guardian/check_arrow.mcfunction b/data/incendium/functions/sanctum/guardian/check_arrow.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/sanctum/guardian/init.mcfunction b/data/incendium/functions/sanctum/guardian/init.mcfunction old mode 100755 new mode 100644 index 0b77e47..fe6ad37 --- a/data/incendium/functions/sanctum/guardian/init.mcfunction +++ b/data/incendium/functions/sanctum/guardian/init.mcfunction @@ -3,9 +3,10 @@ loot replace entity @s weapon.mainhand loot incendium:artifact/patron/holy_wrath -data modify entity @s CustomName set value '{"text": "Sanctum Guardian", "color": "#DAA520"}' +data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Sanctum Guardian",{"translate":"incendium.mob.sanctum.guardian.name"}], "color": "#DAA520"}' data modify entity @s HandDropChances set value [40.0f,40.0f] data modify entity @s ArmorItems set value [{id:"minecraft:netherite_helmet", Count:1b}, {id:"minecraft:iron_chestplate", Count:1b, tag:{Enchantments:[{id:"minecraft:blast_resistance",lvl:10s}]}}, {id:"minecraft:iron_leggings", Count:1b}, {id:"minecraft:golden_boots"}] +data modify entity @s PersistenceRequired set value 1b tag @s add in.ticking_entity effect give @s fire_resistance 1000000 2 true diff --git a/data/incendium/functions/sanctum/guardian/main.mcfunction b/data/incendium/functions/sanctum/guardian/main.mcfunction old mode 100755 new mode 100644 index 30ea22b..7089e2d --- a/data/incendium/functions/sanctum/guardian/main.mcfunction +++ b/data/incendium/functions/sanctum/guardian/main.mcfunction @@ -7,4 +7,7 @@ execute anchored eyes as @e[type=#arrows,distance=..3,tag=!in.checked] run funct # reapply, jank effect give @s[predicate=incendium:random/1] fire_resistance 1000000 2 true +# Mining Fatigue +execute as @s at @s run effect give @a[distance=..120,predicate=incendium:structure/sanctum,tag=in.valid_player] mining_fatigue 10 2 true + tag @s remove in.self diff --git a/data/incendium/functions/sanctum/guardian/mining_fatigue.mcfunction b/data/incendium/functions/sanctum/guardian/mining_fatigue.mcfunction deleted file mode 100755 index d1ddc59..0000000 --- a/data/incendium/functions/sanctum/guardian/mining_fatigue.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# from: mob/main -# @s: pillagers holding holy wrath - -execute as @e[type=pillager,tag=in.sanctum_guardian] at @s run effect give @a[distance=..120,predicate=incendium:structure/sanctum] mining_fatigue 10 2 true - -execute if entity @e[type=pillager,tag=in.sanctum_guardian] run schedule function incendium:sanctum/guardian/mining_fatigue 60t replace diff --git a/data/incendium/functions/sanctum/mob/init.mcfunction b/data/incendium/functions/sanctum/mob/init.mcfunction old mode 100755 new mode 100644 index deb500c..d89852e --- a/data/incendium/functions/sanctum/mob/init.mcfunction +++ b/data/incendium/functions/sanctum/mob/init.mcfunction @@ -1,18 +1,33 @@ # from: entity/mob/init (called once) # @s: entity +# Set names and tags +execute if entity @s[name="Sanctum Ravager"] run tag @s add in.sanctum_ravager execute if entity @s[name="Dungeon Ravager"] run tag @s add in.sanctum_ravager +execute if entity @s[name="Sanctum Ravager"] run data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Sanctum Ravager",{"translate":"incendium.mob.sanctum.ravager.name"}]}' +execute if entity @s[name="Dungeon Ravager"] run data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Sanctum Ravager",{"translate":"incendium.mob.sanctum.ravager.name"}]}' + execute if entity @s[name="Sanctum Apostle"] run tag @s add in.sanctum_apostle +execute if entity @s[name="Sanctum Apostle"] run data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Sanctum Apostle",{"translate":"incendium.mob.sanctum.apostle.name"}]}' +execute if entity @s[type=pillager,tag=!in.sanctum_apostle] run data modify entity @s ArmorItems set value [{},{},{},{}] + execute if entity @s[name="Sanctum Cultist"] run tag @s add in.sanctum_cultist -execute if entity @s[name="Sanctum Guardian"] run tag @s add in.sanctum_guardian +execute if entity @s[name="Sanctum Cultist"] run data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Sanctum Cultist",{"translate":"incendium.mob.sanctum.cultist.name"}]}' + execute if entity @s[name="Sanctum Illusionist"] run tag @s add in.sanctum_illusionist +execute if entity @s[name="Sanctum Illusionist"] run data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Sanctum Illusionist",{"translate":"incendium.mob.sanctum.illusionist.name"}]}' + execute if entity @s[name="Sanctum Inquisitor"] run tag @s add in.sanctum_inquisitor +execute if entity @s[name="Sanctum Inquisitor"] run data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Sanctum Inquisitor",{"translate":"incendium.mob.sanctum.inquisitor.name"}]}' + execute if entity @s[name="Sanctum Protector"] run tag @s add in.sanctum_protector -execute if entity @s[name="Sanctum Ravager"] run tag @s add in.sanctum_ravager +execute if entity @s[name="Sanctum Protector"] run data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Sanctum Protector",{"translate":"incendium.mob.sanctum.protector.name"}]}' + execute if entity @s[name="Sanctum Ritualist"] run tag @s add in.sanctum_ritualist -execute if entity @s[name="Sanctum Vault Guardian"] run tag @s add in.sanctum_vault_guardian +execute if entity @s[name="Sanctum Ritualist"] run data modify entity @s CustomName set value '{"translate": "%1$s%4733088$s","with":["Sanctum Ritualist",{"translate":"incendium.mob.sanctum.ritualist.name"}]}' -# pillager +execute if entity @s[name="Sanctum Vault Guardian"] run tag @s add in.sanctum_guardian +execute if entity @s[name="Sanctum Guardian"] run tag @s add in.sanctum_guardian execute if entity @s[type=pillager,tag=in.sanctum_guardian] run function incendium:sanctum/guardian/init team join in.sanctum @s diff --git a/data/incendium/functions/sanctum/mob/main.mcfunction b/data/incendium/functions/sanctum/mob/main.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/technical/entity_id/init.mcfunction b/data/incendium/functions/technical/entity_id/init.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/technical/entity_id/reset.mcfunction b/data/incendium/functions/technical/entity_id/reset.mcfunction index f066f59..15139ca 100644 --- a/data/incendium/functions/technical/entity_id/reset.mcfunction +++ b/data/incendium/functions/technical/entity_id/reset.mcfunction @@ -18,4 +18,4 @@ tag @e[tag=in.eid_12] remove in.eid_12 tag @e[tag=in.eid_13] remove in.eid_13 tag @e[tag=in.eid_14] remove in.eid_14 -tellraw @a[tag=in.admin,tag=in.debug] {"text": "Resetting in.eid", "color": "#ff8000"} +tellraw @a[tag=in.admin,tag=in.debug] {"translate": "%1$s%4733088$s","with":["Resetting entity IDs",{"translate":"incendium.system.eid.reset"}], "color": "#ff8000"} diff --git a/data/incendium/functions/technical/load.mcfunction b/data/incendium/functions/technical/load.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/functions/technical/load_message.mcfunction b/data/incendium/functions/technical/load_message.mcfunction index ad73737..e91dc5e 100644 --- a/data/incendium/functions/technical/load_message.mcfunction +++ b/data/incendium/functions/technical/load_message.mcfunction @@ -1,6 +1,6 @@ # from: clocks/wait_for_player -tellraw @a [{"text":"I","color":"#ff8000"},{"text":"n","color":"#ff7800"},{"text":"c","color":"#ff7000"},{"text":"e","color":"#ff6800"},{"text":"n","color":"#ff6000"},{"text":"d","color":"#ff5800"},{"text":"i","color":"#ff5000"},{"text":"u","color":"#ff4800"},{"text":"m","color":"#ff4000"}, " - ", {"translate": "Starmute, et. al"}] +#tellraw @a [{"text":"I","color":"#ff8000"},{"text":"n","color":"#ff7800"},{"text":"c","color":"#ff7000"},{"text":"e","color":"#ff6800"},{"text":"n","color":"#ff6000"},{"text":"d","color":"#ff5800"},{"text":"i","color":"#ff5000"},{"text":"u","color":"#ff4800"},{"text":"m","color":"#ff4000"}, " - ", {"translate": "%1$s%4733088$s","with":["Starmute, et. al",{"translate":"incendium.system.credits"}]}] scoreboard players set $load.message in.constants 1 diff --git a/data/incendium/functions/technical/main.mcfunction b/data/incendium/functions/technical/main.mcfunction old mode 100755 new mode 100644 index 80dd3f5..456fea0 --- a/data/incendium/functions/technical/main.mcfunction +++ b/data/incendium/functions/technical/main.mcfunction @@ -1 +1,5 @@ execute store result score $toggle in.constants if score $toggle in.constants matches 0 + +# pipeline sentry "lives" particles +scoreboard players add $sentry_lives in.dummy 1 +execute if score $sentry_lives in.dummy matches 89.. run scoreboard players set $sentry_lives in.dummy -90 \ No newline at end of file diff --git a/data/incendium/functions/technical/summon_helper.mcfunction b/data/incendium/functions/technical/summon_helper.mcfunction old mode 100755 new mode 100644 diff --git a/data/incendium/item_modifiers/damage.json b/data/incendium/item_modifiers/damage.json old mode 100755 new mode 100644 diff --git a/data/incendium/item_modifiers/damage/extreme.json b/data/incendium/item_modifiers/damage/extreme.json old mode 100755 new mode 100644 diff --git a/data/incendium/item_modifiers/damage/medium.json b/data/incendium/item_modifiers/damage/medium.json old mode 100755 new mode 100644 diff --git a/data/incendium/item_modifiers/infernal_wings/upgrade.json b/data/incendium/item_modifiers/infernal_wings/upgrade.json index 2142662..f819f85 100644 --- a/data/incendium/item_modifiers/infernal_wings/upgrade.json +++ b/data/incendium/item_modifiers/infernal_wings/upgrade.json @@ -3,23 +3,23 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "A pair of armored wings", + "translate": "%1$s%4733088$s","with":["A pair of armored wings",{"translate":"incendium.item.infernal_wings.desc1"}], "color": "#ff1234", "italic": true }, { - "translate": "forged from the scraps", + "translate": "%1$s%4733088$s","with":["forged from the scraps",{"translate":"incendium.item.infernal_wings.desc2"}], "color": "#ff1234", "italic": true }, { - "translate": "of the Hovering Inferno's shields", + "translate": "%1$s%4733088$s","with":["of the Hovering Inferno's shields",{"translate":"incendium.item.infernal_wings.desc3"}], "color": "#ff1234", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -29,7 +29,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Infernal Wings", + "translate": "%1$s%4733088$s","with":["Infernal Wings",{"translate":"incendium.item.infernal_wings.name"}], "color": "#ff3333", "italic": false } diff --git a/data/incendium/item_modifiers/ragnarok/fix.json b/data/incendium/item_modifiers/ragnarok/fix.json old mode 100755 new mode 100644 diff --git a/data/incendium/item_modifiers/ragnarok/update.json b/data/incendium/item_modifiers/ragnarok/update.json old mode 100755 new mode 100644 diff --git a/data/incendium/item_modifiers/scouts_battle_helm/update.json b/data/incendium/item_modifiers/scouts_battle_helm/update.json old mode 100755 new mode 100644 diff --git a/data/incendium/item_modifiers/trailblazer/fix.json b/data/incendium/item_modifiers/trailblazer/fix.json old mode 100755 new mode 100644 diff --git a/data/incendium/item_modifiers/trailblazer/update.json b/data/incendium/item_modifiers/trailblazer/update.json old mode 100755 new mode 100644 diff --git a/data/incendium/item_modifiers/trailblazer/update.json.bugged b/data/incendium/item_modifiers/trailblazer/update.json.bugged old mode 100755 new mode 100644 diff --git a/data/incendium/item_modifiers/unload.json b/data/incendium/item_modifiers/unload.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/artifact/firestorm_drop.json b/data/incendium/loot_tables/artifact/firestorm_drop.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/artifact/misc/restless_nature.json b/data/incendium/loot_tables/artifact/misc/restless_nature.json index c96d3db..2398b8a 100644 --- a/data/incendium/loot_tables/artifact/misc/restless_nature.json +++ b/data/incendium/loot_tables/artifact/misc/restless_nature.json @@ -12,25 +12,23 @@ "entity": "this", "lore": [ { - "translate": "A seed infused by spirits", + "translate": "%1$s%4733088$s","with":["A seed infused by spirits",{"translate":"incendium.item.restless_nature.desc1"}], "color": "#169e7e", "italic": true }, { - "text": "with a final wish to regrow", + "translate": "%1$s%4733088$s","with":["with a final wish to regrow",{"translate":"incendium.item.restless_nature.desc2"}], "color": "#169e7e", "italic": true }, { - "text": "the lost nature of the Nether", + "translate": "%1$s%4733088$s","with":["the lost nature of the Nether",{"translate":"incendium.item.restless_nature.desc3"}], "color": "#169e7e", "italic": true }, + "", { - "text": "" - }, - { - "text": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -41,7 +39,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Restless Nature", + "translate": "%1$s%4733088$s","with":["Restless Nature",{"translate":"incendium.item.restless_nature.name"}], "color": "#137682", "italic": false } diff --git a/data/incendium/loot_tables/artifact/patron/daybreaker.json b/data/incendium/loot_tables/artifact/patron/daybreaker.json old mode 100755 new mode 100644 index 909b299..1366e74 --- a/data/incendium/loot_tables/artifact/patron/daybreaker.json +++ b/data/incendium/loot_tables/artifact/patron/daybreaker.json @@ -44,24 +44,24 @@ "entity": "this", "lore": [ { - "translate": "Has a chance to drop gold", + "translate": "%1$s%4733088$s","with":["Has a chance to drop gold",{"translate":"incendium.item.daybreaker.desc1"}], "color": "#cc9900", "italic": true }, { - "translate": "when killing any mob", + "translate": "%1$s%4733088$s","with":["when killing any mob",{"translate":"incendium.item.daybreaker.desc2"}], "color": "#cc9900", "italic": true }, "", { - "translate": "Patron Item", + "translate": "%1$s%4733088$s","with":["Patron Item",{"translate":"incendium.system.patron_item"}], "color": "#333333", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -72,7 +72,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Daybreaker", + "translate": "%1$s%4733088$s","with":["Daybreaker",{"translate":"incendium.item.daybreaker.name"}], "color": "#ffcc00", "italic": false } diff --git a/data/incendium/loot_tables/artifact/patron/holy_wrath.json b/data/incendium/loot_tables/artifact/patron/holy_wrath.json old mode 100755 new mode 100644 index 75eeca8..e39553d --- a/data/incendium/loot_tables/artifact/patron/holy_wrath.json +++ b/data/incendium/loot_tables/artifact/patron/holy_wrath.json @@ -12,13 +12,13 @@ "entity": "this", "lore": [ { - "translate": "Spawn a spiral of fireballs", + "translate": "%1$s%4733088$s","with":["Spawn a spiral of fireballs",{"translate":"incendium.item.holy_wrath.desc1"}], "color": "#ccbb88", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -29,7 +29,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Holy Wrath", + "translate": "%1$s%4733088$s","with":["Holy Wrath",{"translate":"incendium.item.holy_wrath.name"}], "color": "#ffee77", "italic": false } diff --git a/data/incendium/loot_tables/artifact/patron/scouts_battle_helm.json b/data/incendium/loot_tables/artifact/patron/scouts_battle_helm.json old mode 100755 new mode 100644 index e8d1f6b..a0f2629 --- a/data/incendium/loot_tables/artifact/patron/scouts_battle_helm.json +++ b/data/incendium/loot_tables/artifact/patron/scouts_battle_helm.json @@ -12,28 +12,24 @@ "entity": "this", "lore": [ { - "translate": "You can hide, but you can't", + "translate": "%1$s%4733088$s","with":["You can hide, but you can't",{"translate":"incendium.item.battle_helm.desc1"}], "color": "#ccbb88", "italic": true }, { - "translate": "outrun TheDancyScout", + "translate": "%1$s%4733088$s","with":["outrun TheDancyScout",{"translate":"incendium.item.battle_helm.desc2"}], "color": "#ccbb88", "italic": true }, + "", { - "translate": "", - "color": "#884400", - "italic": false - }, - { - "translate": "Patron Item", + "translate": "%1$s%4733088$s","with":["Patron Item",{"translate":"incendium.system.patron_item"}], "color": "#333333", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -44,7 +40,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Scout's Battle Helm", + "translate": "%1$s%4733088$s","with":["Scout's Battle Helm",{"translate":"incendium.item.battle_helm.name"}], "color": "#ff9944", "italic": false } diff --git a/data/incendium/loot_tables/artifact/patron/scroll_of_returning.json b/data/incendium/loot_tables/artifact/patron/scroll_of_returning.json old mode 100755 new mode 100644 index d00efca..6e34ebe --- a/data/incendium/loot_tables/artifact/patron/scroll_of_returning.json +++ b/data/incendium/loot_tables/artifact/patron/scroll_of_returning.json @@ -12,29 +12,29 @@ "entity": "this", "lore": [ { - "translate": "A long forgotten technique", + "translate": "%1$s%4733088$s","with":["A long forgotten technique",{"translate":"incendium.item.returning_scroll.desc1"}], "color": "#D393F5", "italic": true }, { - "translate": "to transport back to the", + "translate": "%1$s%4733088$s","with":["to transport back to the",{"translate":"incendium.item.returning_scroll.desc2"}], "color": "#D393F5", "italic": true }, { - "translate": "overworld, where it all began...", + "translate": "%1$s%4733088$s","with":["overworld, where it all began...",{"translate":"incendium.item.returning_scroll.desc3"}], "color": "#D393F5", "italic": true }, "", { - "translate": "Patron Item", + "translate": "%1$s%4733088$s","with":["Patron Item",{"translate":"incendium.system.patron_item"}], "color": "#333333", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -45,7 +45,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Scroll of Returning", + "translate": "%1$s%4733088$s","with":["Scroll of Returning",{"translate":"incendium.item.returning_scroll.name"}], "color": "#7F32A9", "italic": false } diff --git a/data/incendium/loot_tables/artifact/patron/warping_witherblade.json b/data/incendium/loot_tables/artifact/patron/warping_witherblade.json old mode 100755 new mode 100644 index 1e80715..aa6b001 --- a/data/incendium/loot_tables/artifact/patron/warping_witherblade.json +++ b/data/incendium/loot_tables/artifact/patron/warping_witherblade.json @@ -40,22 +40,30 @@ "function": "minecraft:set_lore", "entity": "this", "lore": [ + [ + { + "text": "\"", + "color": "#006666", + "italic": true + }, + { + "translate": "%1$s%4733088$s","with":["For in life all things return",{"translate":"incendium.item.warping_witherblade.desc1"}], + "color": "#006666", + "italic": true + } + ], { - "translate": "\"For in life all things return", - "color": "#006666", - "italic": true - }, - { - "translate": "to death, and in death all things", + "translate": "%1$s%4733088$s","with":["to death, and in death all things",{"translate":"incendium.item.warping_witherblade.desc2"}], "color": "#006666", "italic": true }, [ { - "translate": "return to the shadow of ", + "translate": "%1$s%4733088$s","with":["return to the shadow of",{"translate":"incendium.item.warping_witherblade.desc3"}], "color": "#006666", "italic": true }, + " ", { "text": "CENSOR", "color": "#006666", @@ -69,19 +77,15 @@ "obfuscated": false } ], + "", { - "translate": "", - "color": "#884400", - "italic": false - }, - { - "translate": "Patron Item", + "translate": "%1$s%4733088$s","with":["Patron Item",{"translate":"incendium.system.patron_item"}], "color": "#333333", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -92,7 +96,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Warping Witherblade", + "translate": "%1$s%4733088$s","with":["Warping Witherblade",{"translate":"incendium.item.warping_witherblade.name"}], "color": "#330099", "italic": false } diff --git a/data/incendium/loot_tables/artifact/ragnarok_drop.json b/data/incendium/loot_tables/artifact/ragnarok_drop.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/artifact/scarlet_or_sacrifice.json b/data/incendium/loot_tables/artifact/scarlet_or_sacrifice.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/artifact/scroll_drop.json b/data/incendium/loot_tables/artifact/scroll_drop.json new file mode 100644 index 0000000..9529d96 --- /dev/null +++ b/data/incendium/loot_tables/artifact/scroll_drop.json @@ -0,0 +1,19 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:loot_table", + "name": "incendium:artifact/patron/scroll_of_returning", + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.5 + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/data/incendium/loot_tables/artifact/shield/necrotic_shield.json b/data/incendium/loot_tables/artifact/shield/necrotic_shield.json old mode 100755 new mode 100644 index 118d391..12e9a7a --- a/data/incendium/loot_tables/artifact/shield/necrotic_shield.json +++ b/data/incendium/loot_tables/artifact/shield/necrotic_shield.json @@ -29,18 +29,18 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Reacts to attacks with", + "translate": "%1$s%4733088$s","with":["Reacts to attacks with",{"translate":"incendium.item.necrotic_shield.desc1"}], "color": "#884444", "italic": true }, { - "translate": "an explosion of death", + "translate": "%1$s%4733088$s","with":["an explosion of death",{"translate":"incendium.item.necrotic_shield.desc2"}], "color": "#884444", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -51,7 +51,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Necrotic Shield", + "translate": "%1$s%4733088$s","with":["Necrotic Shield",{"translate":"incendium.item.necrotic_shield.name"}], "italic": false, "color": "#993333" } diff --git a/data/incendium/loot_tables/artifact/shield/prismatic_shield.json b/data/incendium/loot_tables/artifact/shield/prismatic_shield.json old mode 100755 new mode 100644 index f1c71d5..c35973e --- a/data/incendium/loot_tables/artifact/shield/prismatic_shield.json +++ b/data/incendium/loot_tables/artifact/shield/prismatic_shield.json @@ -30,24 +30,18 @@ "entity": "this", "lore": [ { - "translate": "Reflects long-range attacks with a", + "translate": "%1$s%4733088$s","with":["Reflects attacks with a",{"translate":"incendium.item.prismatic_shield.desc1"}], + "color": "#88aaff", + "italic": false + }, + { + "translate": "%1$s%4733088$s","with":["powerful spark of light",{"translate":"incendium.item.prismatic_shield.desc2"}], "color": "#88aaff", "italic": false }, - [ - { - "translate": "colorized", - "color": "#ea2ed1" - }, - { - "translate": " spark of light", - "color": "#88aaff", - "italic": false - } - ], "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -57,7 +51,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Prismatic Shield", + "translate": "%1$s%4733088$s","with":["Prismatic Shield",{"translate":"incendium.item.prismatic_shield.name"}], "italic": false, "color": "#bbddff" } @@ -95,18 +89,18 @@ "entity": "this", "lore": [ { - "translate": "Reflects attacks with a", + "translate": "%1$s%4733088$s","with":["Reflects attacks with a",{"translate":"incendium.item.prismatic_shield.desc1"}], "color": "#88aaff", "italic": false }, { - "translate": "powerful spark of light", + "translate": "%1$s%4733088$s","with":["powerful spark of light",{"translate":"incendium.item.prismatic_shield.desc2"}], "color": "#88aaff", "italic": false }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -116,7 +110,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Prismatic Shield", + "translate": "%1$s%4733088$s","with":["Prismatic Shield",{"translate":"incendium.item.prismatic_shield.name"}], "italic": false, "color": "#bbddff" } diff --git a/data/incendium/loot_tables/artifact/shield/radiation_shield.json b/data/incendium/loot_tables/artifact/shield/radiation_shield.json old mode 100755 new mode 100644 index 831559f..72b6a01 --- a/data/incendium/loot_tables/artifact/shield/radiation_shield.json +++ b/data/incendium/loot_tables/artifact/shield/radiation_shield.json @@ -12,18 +12,18 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Releases radiation", + "translate": "%1$s%4733088$s","with":["Releases radiation",{"translate":"incendium.item.radiation_shield.desc1"}], "color": "#77cc00", - "italic": "false" + "italic": false }, { - "translate": "when blocking an attack", + "translate": "%1$s%4733088$s","with":["when blocking an attack",{"translate":"incendium.item.radiation_shield.desc2"}], "color": "#77cc00", - "italic": "false" + "italic": false }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -34,7 +34,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Radiation Shield", + "translate": "%1$s%4733088$s","with":["Radiation Shield",{"translate":"incendium.item.radiation_shield.name"}], "italic": false, "color": "#44ff00" } diff --git a/data/incendium/loot_tables/artifact/tool/cake_batter.json b/data/incendium/loot_tables/artifact/tool/cake_batter.json old mode 100755 new mode 100644 index 9d5e39f..cf6539e --- a/data/incendium/loot_tables/artifact/tool/cake_batter.json +++ b/data/incendium/loot_tables/artifact/tool/cake_batter.json @@ -27,13 +27,13 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Torte's infamous deadly cake!", + "translate": "%1$s%4733088$s","with":["Torte's infamous deadly cake!",{"translate":"incendium.item.cake.desc1"}], "color": "#ff69b4", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -47,7 +47,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Cake Batter", + "translate": "%1$s%4733088$s","with":["Cake Batter",{"translate":"incendium.item.cake.name"}], "color": "#ffddf4", "italic": false } diff --git a/data/incendium/loot_tables/artifact/tool/hazmat_suit.json b/data/incendium/loot_tables/artifact/tool/hazmat_suit.json old mode 100755 new mode 100644 index a49195f..0002406 --- a/data/incendium/loot_tables/artifact/tool/hazmat_suit.json +++ b/data/incendium/loot_tables/artifact/tool/hazmat_suit.json @@ -15,7 +15,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Hazmat Helmet", + "translate": "%1$s%4733088$s","with":["Hazmat Helmet",{"translate":"incendium.item.hazmat.helmet.name"}], "color": "#44ff00", "italic": false } @@ -39,13 +39,13 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Protects the wearer from poison", + "translate": "%1$s%4733088$s","with":["Protects the wearer from poison",{"translate":"incendium.item.hazmat.suit.desc1"}], "color": "#77cc00", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -80,13 +80,13 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Protects the wearer from poison", + "translate": "%1$s%4733088$s","with":["Protects the wearer from poison",{"translate":"incendium.item.hazmat.suit.desc1"}], "color": "#77cc00", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -96,7 +96,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Hazmat Chestplate", + "translate": "%1$s%4733088$s","with":["Hazmat Chestplate",{"translate":"incendium.item.hazmat.chestplate.name"}], "color": "#44ff00", "italic": false } @@ -144,13 +144,13 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Protects the wearer from poison", + "translate": "%1$s%4733088$s","with":["Protects the wearer from poison",{"translate":"incendium.item.hazmat.suit.desc1"}], "color": "#77cc00", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -160,7 +160,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Hazmat Leggings", + "translate": "%1$s%4733088$s","with":["Hazmat Leggings",{"translate":"incendium.item.hazmat.leggings.name"}], "color": "#44ff00", "italic": false } @@ -208,13 +208,13 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Protects the wearer from poison", + "translate": "%1$s%4733088$s","with":["Protects the wearer from poison",{"translate":"incendium.item.hazmat.suit.desc1"}], "color": "#77cc00", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -224,7 +224,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Hazmat Boots", + "translate": "%1$s%4733088$s","with":["Hazmat Boots",{"translate":"incendium.item.hazmat.boots.name"}], "color": "#44ff00", "italic": false } diff --git a/data/incendium/loot_tables/artifact/tool/hefty_pickaxe.json b/data/incendium/loot_tables/artifact/tool/hefty_pickaxe.json old mode 100755 new mode 100644 index cd4fcf2..88be084 --- a/data/incendium/loot_tables/artifact/tool/hefty_pickaxe.json +++ b/data/incendium/loot_tables/artifact/tool/hefty_pickaxe.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Hefty Pickaxe", + "translate": "%1$s%4733088$s","with":["Hefty Pickaxe",{"translate":"incendium.item.hefty_pickaxe.name"}], "color": "#990025", "italic": false } @@ -19,13 +19,13 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "A nether-oriented excavator", + "translate": "%1$s%4733088$s","with":["A nether-oriented excavator",{"translate":"incendium.item.hefty_pickaxe.desc1"}], "color": "#880012", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } diff --git a/data/incendium/loot_tables/artifact/tool/infernal_feather.json b/data/incendium/loot_tables/artifact/tool/infernal_feather.json old mode 100755 new mode 100644 index 1075970..a56a352 --- a/data/incendium/loot_tables/artifact/tool/infernal_feather.json +++ b/data/incendium/loot_tables/artifact/tool/infernal_feather.json @@ -36,7 +36,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Infernal Feather", + "translate": "%1$s%4733088$s","with":["Infernal Feather",{"translate":"incendium.item.infernal_feather.name"}], "color": "#ff3333", "italic": false } @@ -45,23 +45,23 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "The strong piece of scrap", + "translate": "%1$s%4733088$s","with":["The strong piece of scrap",{"translate":"incendium.item.infernal_feather.desc1"}], "color": "#ff1234", "italic": true }, { - "translate": "forged from the remains", + "translate": "%1$s%4733088$s","with":["forged from the remains",{"translate":"incendium.item.infernal_feather.desc2"}], "color": "#ff1234", "italic": true }, { - "translate": "of the Hovering Inferno's shields", + "translate": "%1$s%4733088$s","with":["of the Hovering Inferno's shields",{"translate":"incendium.item.infernal_wings.desc3"}], "color": "#ff1234", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } diff --git a/data/incendium/loot_tables/artifact/tool/infernal_wings.json b/data/incendium/loot_tables/artifact/tool/infernal_wings.json old mode 100755 new mode 100644 index 7343cf1..3a67b33 --- a/data/incendium/loot_tables/artifact/tool/infernal_wings.json +++ b/data/incendium/loot_tables/artifact/tool/infernal_wings.json @@ -36,7 +36,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Infernal Wings", + "translate": "%1$s%4733088$s","with":["Infernal Wings",{"translate":"incendium.item.infernal_wings.name"}], "color": "#ff3333", "italic": false } @@ -45,23 +45,23 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "A pair of armored wings", + "translate": "%1$s%4733088$s","with":["A pair of armored wings",{"translate":"incendium.item.infernal_wings.desc1"}], "color": "#ff1234", "italic": true }, { - "translate": "forged from the scraps", + "translate": "%1$s%4733088$s","with":["forged from the scraps",{"translate":"incendium.item.infernal_wings.desc2"}], "color": "#ff1234", "italic": true }, { - "translate": "of the Hovering Inferno's shields", + "translate": "%1$s%4733088$s","with":["of the Hovering Inferno's shields",{"translate":"incendium.item.infernal_wings.desc3"}], "color": "#ff1234", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -70,7 +70,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:1450201,incendium:{item:'infernal_feather'},Enchantments:[{}]}" + "tag": "{CustomModelData:1450201,incendium:{item:'infernal_wings'},Enchantments:[{}]}" } ] } diff --git a/data/incendium/loot_tables/artifact/tool/torch_of_lunacy.json b/data/incendium/loot_tables/artifact/tool/torch_of_lunacy.json old mode 100755 new mode 100644 index 9b06aee..64999ea --- a/data/incendium/loot_tables/artifact/tool/torch_of_lunacy.json +++ b/data/incendium/loot_tables/artifact/tool/torch_of_lunacy.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Torch of Lunacy", + "translate": "%1$s%4733088$s","with":["Torch of Lunacy",{"translate":"incendium.item.lunacy_torch.name"}], "color": "#aaccff", "italic": false } @@ -20,23 +20,23 @@ "entity": "this", "lore": [ { - "translate": "Emits a strange light which", + "translate": "%1$s%4733088$s","with":["Emits a strange light which",{"translate":"incendium.item.lunacy_torch.desc1"}], "color": "#aaffcc", "italic": true }, { - "translate": "blinds nearby desert blazes", + "translate": "%1$s%4733088$s","with":["blinds nearby desert blazes",{"translate":"incendium.item.lunacy_torch.desc2"}], "color": "#aaffcc", "italic": true }, { - "translate": "if kept in your inventory", + "translate": "%1$s%4733088$s","with":["if kept in your inventory",{"translate":"incendium.item.lunacy_torch.desc3"}], "color": "#aaffcc", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } diff --git a/data/incendium/loot_tables/artifact/tool/unstable_powder.json b/data/incendium/loot_tables/artifact/tool/unstable_powder.json old mode 100755 new mode 100644 index 8f91eab..4087e64 --- a/data/incendium/loot_tables/artifact/tool/unstable_powder.json +++ b/data/incendium/loot_tables/artifact/tool/unstable_powder.json @@ -18,13 +18,13 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Emits a brilliant light when dropped", + "translate": "%1$s%4733088$s","with":["Emits a brilliant light when dropped",{"translate":"incendium.item.unstable_powder.desc1"}], "color": "#666633", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -33,7 +33,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Unstable Powder", + "translate": "%1$s%4733088$s","with":["Unstable Powder",{"translate":"incendium.item.unstable_powder.name"}], "color": "#ffeebb", "italic": false } diff --git a/data/incendium/loot_tables/artifact/trailblazer_drop.json b/data/incendium/loot_tables/artifact/trailblazer_drop.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/artifact/weapon/blazing_hatchet.json b/data/incendium/loot_tables/artifact/weapon/blazing_hatchet.json old mode 100755 new mode 100644 index c2e1a3e..b10e844 --- a/data/incendium/loot_tables/artifact/weapon/blazing_hatchet.json +++ b/data/incendium/loot_tables/artifact/weapon/blazing_hatchet.json @@ -11,7 +11,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Blazing Hatchet", + "translate": "%1$s%4733088$s","with":["Blazing Hatchet",{"translate":"incendium.item.blazing_hatchet.name"}], "italic": false, "color": "#ff6622" } @@ -20,13 +20,13 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Packs a fiery, yet powerful punch", + "translate": "%1$s%4733088$s","with":["Packs a fiery, yet powerful punch",{"translate":"incendium.item.blazing_hatchet.desc1"}], "color": "#ff8844", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } diff --git a/data/incendium/loot_tables/artifact/weapon/chilling_blade.json b/data/incendium/loot_tables/artifact/weapon/chilling_blade.json old mode 100755 new mode 100644 index e9704f8..3a13180 --- a/data/incendium/loot_tables/artifact/weapon/chilling_blade.json +++ b/data/incendium/loot_tables/artifact/weapon/chilling_blade.json @@ -11,13 +11,13 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Freezes souls to the core", + "translate": "%1$s%4733088$s","with":["Freezes souls to the core",{"translate":"incendium.item.chilling_blade.desc1"}], "color": "#0055aa", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -31,7 +31,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Chilling Blade", + "translate": "%1$s%4733088$s","with":["Chilling Blade",{"translate":"incendium.item.chilling_blade.name"}], "color": "#0088ff", "italic": false } diff --git a/data/incendium/loot_tables/artifact/weapon/firestorm.json b/data/incendium/loot_tables/artifact/weapon/firestorm.json old mode 100755 new mode 100644 index a34ea29..e6c6b9d --- a/data/incendium/loot_tables/artifact/weapon/firestorm.json +++ b/data/incendium/loot_tables/artifact/weapon/firestorm.json @@ -20,18 +20,18 @@ "entity": "this", "lore": [ { - "translate": "Turns spectral arrows into", + "translate": "%1$s%4733088$s","with":["Turns spectral arrows into",{"translate":"incendium.item.firestorm.desc1"}], "color": "#eb783f", "italic": true }, { - "translate": "a powerful lightning attack", + "translate": "%1$s%4733088$s","with":["a powerful lightning attack",{"translate":"incendium.item.firestorm.desc2"}], "color": "#eb783f", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -43,7 +43,7 @@ "entity": "this", "name": [ { - "translate": "Firestorm", + "translate": "%1$s%4733088$s","with":["Firestorm",{"translate":"incendium.item.firestorm.name"}], "color": "#ff4400", "italic": false } diff --git a/data/incendium/loot_tables/artifact/weapon/greatsword_of_sacrifice.json b/data/incendium/loot_tables/artifact/weapon/greatsword_of_sacrifice.json old mode 100755 new mode 100644 index 18817b1..8c9b538 --- a/data/incendium/loot_tables/artifact/weapon/greatsword_of_sacrifice.json +++ b/data/incendium/loot_tables/artifact/weapon/greatsword_of_sacrifice.json @@ -41,18 +41,18 @@ "entity": "this", "lore": [ { - "translate": "Drains the life of its wielder", + "translate": "%1$s%4733088$s","with":["Drains the life of its wielder",{"translate":"incendium.item.greatsword.desc1"}], "color": "#990000", "italic": true }, { - "translate": "to inflict massive damage", + "translate": "%1$s%4733088$s","with":["to inflict massive damage",{"translate":"incendium.item.greatsword.desc2"}], "color": "#990000", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -62,7 +62,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Greatsword of Sacrifice", + "translate": "%1$s%4733088$s","with":["Greatsword of Sacrifice",{"translate":"incendium.item.greatsword.name"}], "color": "#ff0000", "italic": false } diff --git a/data/incendium/loot_tables/artifact/weapon/multiplex_crossbow.json b/data/incendium/loot_tables/artifact/weapon/multiplex_crossbow.json old mode 100755 new mode 100644 index d886010..3c6a01d --- a/data/incendium/loot_tables/artifact/weapon/multiplex_crossbow.json +++ b/data/incendium/loot_tables/artifact/weapon/multiplex_crossbow.json @@ -11,7 +11,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Multiplex Crossbow", + "translate": "%1$s%4733088$s","with":["Multiplex",{"translate":"incendium.item.multiplex.name"}], "color": "#ccbb44", "italic": false } @@ -21,18 +21,18 @@ "entity": "this", "lore": [ { - "translate": "Shoots a blast of fiery", + "translate": "%1$s%4733088$s","with":["Shoots a blast of fiery",{"translate":"incendium.item.multiplex.desc1"}], "color": "#ddcc55", "italic": true }, { - "translate": "arrows at a short-range", + "translate": "%1$s%4733088$s","with":["arrows at a short-range",{"translate":"incendium.item.multiplex.desc2"}], "color": "#ddcc55", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } diff --git a/data/incendium/loot_tables/artifact/weapon/ragnarok.json b/data/incendium/loot_tables/artifact/weapon/ragnarok.json old mode 100755 new mode 100644 index 9b830c4..ccae046 --- a/data/incendium/loot_tables/artifact/weapon/ragnarok.json +++ b/data/incendium/loot_tables/artifact/weapon/ragnarok.json @@ -12,18 +12,18 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "The longer you hold back the bow,", + "translate": "%1$s%4733088$s","with":["The longer you hold back the bow,",{"translate":"incendium.item.ragnarok.desc1"}], "color": "#ABC4B8", "italic": true }, { - "translate": "the more powerful the lightning you create", + "translate": "%1$s%4733088$s","with":["the more powerful the lightning you create",{"translate":"incendium.item.ragnarok.desc2"}], "color": "#ABC4B8", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -35,7 +35,7 @@ "function": "minecraft:set_name", "name": [ { - "translate": "Ragnarok", + "translate": "%1$s%4733088$s","with":["Ragnarok",{"translate":"incendium.item.ragnarok.name"}], "color": "#CCEBDB", "italic": false } diff --git a/data/incendium/loot_tables/artifact/weapon/scarlet_dagger.json b/data/incendium/loot_tables/artifact/weapon/scarlet_dagger.json old mode 100755 new mode 100644 index 562fc03..3770e40 --- a/data/incendium/loot_tables/artifact/weapon/scarlet_dagger.json +++ b/data/incendium/loot_tables/artifact/weapon/scarlet_dagger.json @@ -41,13 +41,13 @@ "entity": "this", "lore": [ { - "translate": "Drains the life of its slain victims", + "translate": "%1$s%4733088$s","with":["Drains the life of its slain victims",{"translate":"incendium.item.scarlet_dagger.desc1"}], "color": "#990000", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -57,7 +57,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Scarlet Dagger", + "translate": "%1$s%4733088$s","with":["Scarlet Dagger",{"translate":"incendium.item.scarlet_dagger.name"}], "color": "#ff0000", "italic": false } diff --git a/data/incendium/loot_tables/artifact/weapon/sentrys_wrath.json b/data/incendium/loot_tables/artifact/weapon/sentrys_wrath.json old mode 100755 new mode 100644 index e23c604..dbd52fb --- a/data/incendium/loot_tables/artifact/weapon/sentrys_wrath.json +++ b/data/incendium/loot_tables/artifact/weapon/sentrys_wrath.json @@ -18,23 +18,23 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Turns spectral arrows into", + "translate": "%1$s%4733088$s","with":["Turns spectral arrows into",{"translate":"incendium.item.firestorm.desc1"}], "color": "#0077bb", "italic": true }, { - "translate": "a slow, powerful attack.", + "translate": "%1$s%4733088$s","with":["a slow, powerful attack.",{"translate":"incendium.item.sentrys_wrath.desc2"}], "color": "#0077bb", "italic": true }, { - "translate": "Beware the cooldown.", + "translate": "%1$s%4733088$s","with":["Beware the cooldown.",{"translate":"incendium.item.sentrys_wrath.desc3"}], "color": "#0077bb", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -44,7 +44,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Sentry's Wrath", + "translate": "%1$s%4733088$s","with":["Sentry's Wrath",{"translate":"incendium.item.sentrys_wrath.name"}], "color": "#33ccff", "italic": false } diff --git a/data/incendium/loot_tables/artifact/weapon/trailblazer.json b/data/incendium/loot_tables/artifact/weapon/trailblazer.json old mode 100755 new mode 100644 index 4f044ca..23c58a2 --- a/data/incendium/loot_tables/artifact/weapon/trailblazer.json +++ b/data/incendium/loot_tables/artifact/weapon/trailblazer.json @@ -11,28 +11,28 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Fires more powerful arrows", + "translate": "%1$s%4733088$s","with":["Fires more powerful arrows",{"translate":"incendium.item.trailblazer.desc1"}], "color": "#C46731", "italic": true }, { - "translate": "the longer you pull the bow.", + "translate": "%1$s%4733088$s","with":["the longer you pull the bow.",{"translate":"incendium.item.trailblazer.desc2"}], "color": "#C46731", "italic": true }, { - "translate": "Spectral arrows leave", + "translate": "%1$s%4733088$s","with":["Spectral arrows leave",{"translate":"incendium.item.trailblazer.desc3"}], "color": "#C46731", "italic": true }, { - "translate": "a trail of blaze.", + "translate": "%1$s%4733088$s","with":["a trail of blaze.",{"translate":"incendium.item.trailblazer.desc4"}], "color": "#C46731", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -42,7 +42,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Trailblazer", + "translate": "%1$s%4733088$s","with":["Trailblazer",{"translate":"incendium.item.trailblazer.name"}], "color": "#F7823E", "italic": false } diff --git a/data/incendium/loot_tables/artifact/weapon/voltaic_trident.json b/data/incendium/loot_tables/artifact/weapon/voltaic_trident.json old mode 100755 new mode 100644 index f95c4a5..8b8f63b --- a/data/incendium/loot_tables/artifact/weapon/voltaic_trident.json +++ b/data/incendium/loot_tables/artifact/weapon/voltaic_trident.json @@ -32,13 +32,13 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Feel its electrical power", + "translate": "%1$s%4733088$s","with":["Feel its electrical power",{"translate":"incendium.item.voltaic_trident.desc1"}], "color": "#4400aa", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } @@ -48,7 +48,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Voltaic Trident", + "translate": "%1$s%4733088$s","with":["Voltaic Trident",{"translate":"incendium.item.voltaic_trident.name"}], "color": "#8844ff", "italic": false } diff --git a/data/incendium/loot_tables/artifact/weapon/withersbane.json b/data/incendium/loot_tables/artifact/weapon/withersbane.json old mode 100755 new mode 100644 index 0368927..f527c9f --- a/data/incendium/loot_tables/artifact/weapon/withersbane.json +++ b/data/incendium/loot_tables/artifact/weapon/withersbane.json @@ -17,7 +17,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Withersbane", + "translate": "%1$s%4733088$s","with":["Withersbane",{"translate":"incendium.item.withersbane.name"}], "color": "#ffee99", "italic": false } @@ -26,18 +26,18 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "An ancient blade to smite", + "translate": "%1$s%4733088$s","with":["An ancient blade to smite",{"translate":"incendium.item.withersbane.desc1"}], "color": "#ffdd66", "italic": true }, { - "translate": "the impurity from the Nether", + "translate": "%1$s%4733088$s","with":["the impurity from the Nether",{"translate":"incendium.item.withersbane.desc2"}], "color": "#ffdd66", "italic": true }, "", { - "translate": "Incendium", + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], "color": "#FF8000", "italic": true } diff --git a/data/incendium/loot_tables/barter/crimson.json b/data/incendium/loot_tables/barter/crimson.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/barter/deltas.json b/data/incendium/loot_tables/barter/deltas.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/barter/dunes.json b/data/incendium/loot_tables/barter/dunes.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/barter/generic.json b/data/incendium/loot_tables/barter/generic.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/barter/quartz.json b/data/incendium/loot_tables/barter/quartz.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/barter/ssv.json b/data/incendium/loot_tables/barter/ssv.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/barter/toxic.json b/data/incendium/loot_tables/barter/toxic.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/barter/warped.json b/data/incendium/loot_tables/barter/warped.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/barter/withered.json b/data/incendium/loot_tables/barter/withered.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/barrel/alchemist.json b/data/incendium/loot_tables/castle/barrel/alchemist.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/barrel/barracks.json b/data/incendium/loot_tables/castle/barrel/barracks.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/barrel/blacksmith.json b/data/incendium/loot_tables/castle/barrel/blacksmith.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/barrel/food.json b/data/incendium/loot_tables/castle/barrel/food.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/barrel/food_low.json b/data/incendium/loot_tables/castle/barrel/food_low.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/barrel/generic.json b/data/incendium/loot_tables/castle/barrel/generic.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/barrel/generic_big.json b/data/incendium/loot_tables/castle/barrel/generic_big.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/barrel/greenhouse_secret.json b/data/incendium/loot_tables/castle/barrel/greenhouse_secret.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/barrel/ice.json b/data/incendium/loot_tables/castle/barrel/ice.json old mode 100755 new mode 100644 index d8f6950..7cb85a4 --- a/data/incendium/loot_tables/castle/barrel/ice.json +++ b/data/incendium/loot_tables/castle/barrel/ice.json @@ -115,6 +115,12 @@ "type": "minecraft:loot_table", "name": "incendium:artifact/weapon/chilling_blade" } + ], + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.8 + } ] }, { diff --git a/data/incendium/loot_tables/castle/barrel/library.json b/data/incendium/loot_tables/castle/barrel/library.json old mode 100755 new mode 100644 index cfb5acf..36f21b2 --- a/data/incendium/loot_tables/castle/barrel/library.json +++ b/data/incendium/loot_tables/castle/barrel/library.json @@ -10,7 +10,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{pages:['[\"\",{\"translate\":\"Vvvvvvvvvvv vvv \",\"obfuscated\":true},{\"translate\":\"strange \",\"color\":\"reset\"},{\"translate\":\"vvv\",\"obfuscated\":true},{\"translate\":\" pipes. \",\"color\":\"reset\"},{\"translate\":\"Vvvvv \",\"obfuscated\":true},{\"translate\":\"not known \",\"color\":\"reset\"},{\"translate\":\"vvv\",\"obfuscated\":true},{\"translate\":\" built \",\"color\":\"reset\"},{\"translate\":\"vvvv vvv\",\"obfuscated\":true},{\"translate\":\" danger \",\"color\":\"reset\"},{\"translate\":\"vvvvvvvvsdbdsdg\",\"strikethrough\":true,\"obfuscated\":true},{\"translate\":\" ------\\\\n\\\\nIt seems that the \",\"color\":\"reset\",\"obfuscated\":true},{\"translate\":\"blaz\",\"color\":\"reset\"},{\"translate\":\"es there are fueled by fall\",\"obfuscated\":true},{\"translate\":\"en soul\",\"color\":\"reset\"},{\"translate\":\"s, and their \",\"obfuscated\":true},{\"translate\":\"atta\",\"color\":\"reset\"},{\"translate\":\"cks move at an incredible \",\"obfuscated\":true},{\"translate\":\"speed\",\"color\":\"reset\"},{\"translate\":\".\",\"obfuscated\":true}]'],title:\"§kInvestigations\",author:\"§kThe Ancients\",generation:3}" + "tag": "{pages:['{\"translate\": \"%1$s%4733088$s\", \"with\":[\"\u00a7kVvvvvvvvvvv vvv\u00a7r strange \u00a7kvvv\u00a7r pipes. \u00a7kVvvvv\u00a7r not known \u00a7kvvv\u00a7r built \u00a7kvvvv vvv\u00a7r with \u00a7kvvvvvvvvsdbdsdg: vvvvvv\u00a7r\n\n\u00a7kIt seems that the\u00a7r blaz\u00a7kes there are fuelled by fall\u00a7ren souls,\n\u00a7kand their\u00a7r atta\u00a7kcks move at an incredible\u00a7r speed.\", {\"translate\":\"incendium.book.investigations.page1\"}]}'],title:\"§kInvestigations\",author:\"§kThe Ancients\",generation:3}" } ] } @@ -40,7 +40,7 @@ { "rolls": { "min": 2, - "max": 10 + "max": 8 }, "entries": [ { @@ -73,8 +73,14 @@ }, { "type": "minecraft:item", + "weight": 10, "name": "minecraft:compass" }, + { + "type": "minecraft:item", + "weight": 10, + "name": "minecraft:piglin_banner_pattern" + }, { "type": "minecraft:item", "weight": 10, diff --git a/data/incendium/loot_tables/castle/barrel/library_low.json b/data/incendium/loot_tables/castle/barrel/library_low.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/barrel/lumber.json b/data/incendium/loot_tables/castle/barrel/lumber.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/barrel/lumber_big.json b/data/incendium/loot_tables/castle/barrel/lumber_big.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/barrel/monument.json b/data/incendium/loot_tables/castle/barrel/monument.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/barrel/nuggets.json b/data/incendium/loot_tables/castle/barrel/nuggets.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/barrel/pigstep.json b/data/incendium/loot_tables/castle/barrel/pigstep.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/barrel/random.json b/data/incendium/loot_tables/castle/barrel/random.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/base/blackstone.json b/data/incendium/loot_tables/castle/base/blackstone.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/base/brewing.json b/data/incendium/loot_tables/castle/base/brewing.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/base/gold.json b/data/incendium/loot_tables/castle/base/gold.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/base/gold_big.json b/data/incendium/loot_tables/castle/base/gold_big.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/base/gold_small.json b/data/incendium/loot_tables/castle/base/gold_small.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/base/gold_stackable.json b/data/incendium/loot_tables/castle/base/gold_stackable.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/base/head_self.json b/data/incendium/loot_tables/castle/base/head_self.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/base/random_blocks.json b/data/incendium/loot_tables/castle/base/random_blocks.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/base/rare_potion.json b/data/incendium/loot_tables/castle/base/rare_potion.json old mode 100755 new mode 100644 index 752e76b..2675584 --- a/data/incendium/loot_tables/castle/base/rare_potion.json +++ b/data/incendium/loot_tables/castle/base/rare_potion.json @@ -11,7 +11,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Elixir of Undying", + "translate": "%1$s%4733088$s","with":["Elixir of Undying",{"translate":"incendium.item.undying_elixer.name"}], "color": "#ffcc00", "italic": false } @@ -30,7 +30,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Miner's Ale", + "translate": "%1$s%4733088$s","with":["Miner's Ale",{"translate":"incendium.item.miners_ale.name"}], "color": "#ff4e21", "italic": false } diff --git a/data/incendium/loot_tables/castle/base/tools.json b/data/incendium/loot_tables/castle/base/tools.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/base/tools_armor.json b/data/incendium/loot_tables/castle/base/tools_armor.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/base/unbreaking_efficiency.json b/data/incendium/loot_tables/castle/base/unbreaking_efficiency.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/base/wood.json b/data/incendium/loot_tables/castle/base/wood.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/blacksmith/boots.json b/data/incendium/loot_tables/castle/blacksmith/boots.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/blacksmith/chestplate.json b/data/incendium/loot_tables/castle/blacksmith/chestplate.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/blacksmith/helmet.json b/data/incendium/loot_tables/castle/blacksmith/helmet.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/blacksmith/leggings.json b/data/incendium/loot_tables/castle/blacksmith/leggings.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/entity/alchemist.json b/data/incendium/loot_tables/castle/entity/alchemist.json old mode 100755 new mode 100644 index 6ee65cb..723eb08 --- a/data/incendium/loot_tables/castle/entity/alchemist.json +++ b/data/incendium/loot_tables/castle/entity/alchemist.json @@ -19,8 +19,8 @@ "name": "minecraft:potion", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{Potion:\"minecraft:fire_resistance\"}" + "function": "minecraft:set_potion", + "id": "minecraft:fire_resistance" } ] }, @@ -30,8 +30,8 @@ "name": "minecraft:potion", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{Potion:\"minecraft:regeneration\"}" + "function": "minecraft:set_potion", + "id": "minecraft:regeneration" } ] }, @@ -41,8 +41,8 @@ "name": "minecraft:potion", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{Potion:\"minecraft:strong_healing\"}" + "function": "minecraft:set_potion", + "id": "minecraft:strong_healing" } ] }, @@ -52,8 +52,8 @@ "name": "minecraft:splash_potion", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{Potion:\"minecraft:long_slowness\"}" + "function": "minecraft:set_potion", + "id": "minecraft:slowness" } ] }, @@ -63,8 +63,8 @@ "name": "minecraft:splash_potion", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{Potion:\"minecraft:weakness\"}" + "function": "minecraft:set_potion", + "id": "minecraft:weakness" } ] }, @@ -74,8 +74,8 @@ "name": "minecraft:splash_potion", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{Potion:\"minecraft:strong_harming\"}" + "function": "minecraft:set_potion", + "id": "minecraft:strong_harming" } ] }, @@ -85,13 +85,14 @@ "name": "minecraft:splash_potion", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{Potion:\"minecraft:poison\"}" + "function": "minecraft:set_potion", + "id": "minecraft:poison" } ] }, { "type": "minecraft:loot_table", + "weight": 1, "name": "incendium:castle/base/rare_potion" } ] diff --git a/data/incendium/loot_tables/castle/entity/any.json b/data/incendium/loot_tables/castle/entity/any.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/entity/knight.json b/data/incendium/loot_tables/castle/entity/knight.json old mode 100755 new mode 100644 index ee70f4b..c937e9a --- a/data/incendium/loot_tables/castle/entity/knight.json +++ b/data/incendium/loot_tables/castle/entity/knight.json @@ -4,31 +4,13 @@ { "rolls": 1, "entries": [ - { - "type": "minecraft:loot_table", - "name": "incendium:castle/entity/any" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:ancient_debris" - }, { "type": "minecraft:item", - "weight": 1, "name": "minecraft:netherite_scrap", "functions": [ { "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 1 - } + "count": 1 } ] } @@ -45,89 +27,56 @@ "entries": [ { "type": "minecraft:item", - "weight": 6, - "name": "minecraft:diamond" - }, - { - "type": "minecraft:item", - "weight": 2, + "weight": 1, "name": "minecraft:diamond", "functions": [ { "function": "minecraft:set_count", "count": { - "min": 2, + "min": 1, "max": 3 } } ] - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.1 - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:iron_block" }, { "type": "minecraft:item", "weight": 6, - "name": "minecraft:iron_ingot", + "name": "minecraft:gold_ingot", "functions": [ { "function": "minecraft:set_count", "count": { - "min": 3, - "max": 10 + "min": 2, + "max": 8 } } ] - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.3 - } - ] - }, - { - "rolls": 1, - "entries": [ + }, { "type": "minecraft:item", - "weight": 1, + "weight": 2, "name": "minecraft:gold_block" }, + { + "type": "minecraft:item", + "weight": 2, + "name": "minecraft:iron_block" + }, { "type": "minecraft:item", "weight": 6, - "name": "minecraft:gold_ingot", + "name": "minecraft:iron_ingot", "functions": [ { "function": "minecraft:set_count", "count": { - "min": 3, + "min": 2, "max": 8 } } ] } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } ] } ] diff --git a/data/incendium/loot_tables/castle/entity/scout.json b/data/incendium/loot_tables/castle/entity/scout.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/stand/armor.json b/data/incendium/loot_tables/castle/stand/armor.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/stand/boots.json b/data/incendium/loot_tables/castle/stand/boots.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/stand/chestplate.json b/data/incendium/loot_tables/castle/stand/chestplate.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/stand/helmet.json b/data/incendium/loot_tables/castle/stand/helmet.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/stand/leggings.json b/data/incendium/loot_tables/castle/stand/leggings.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/tower_barrel.json b/data/incendium/loot_tables/castle/tower_barrel.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/castle/treasure/quartz.json b/data/incendium/loot_tables/castle/treasure/quartz.json old mode 100755 new mode 100644 index 66d14d7..fd1ef01 --- a/data/incendium/loot_tables/castle/treasure/quartz.json +++ b/data/incendium/loot_tables/castle/treasure/quartz.json @@ -44,7 +44,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Torte", + "translate": "%1$s%4733088$s","with":["Torte",{"translate":"incendium.mob.quartz.torte.name"}], "color": "#ffccbb", "italic": false } diff --git a/data/incendium/loot_tables/cvill/blacksmith.json b/data/incendium/loot_tables/cvill/blacksmith.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/cvill/butcher.json b/data/incendium/loot_tables/cvill/butcher.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/cvill/farmer.json b/data/incendium/loot_tables/cvill/farmer.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/cvill/low.json b/data/incendium/loot_tables/cvill/low.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/cvill/lumberjack.json b/data/incendium/loot_tables/cvill/lumberjack.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/cvill/medium.json b/data/incendium/loot_tables/cvill/medium.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/cvill/mob/brewer.json b/data/incendium/loot_tables/cvill/mob/brewer.json new file mode 100644 index 0000000..62969e3 --- /dev/null +++ b/data/incendium/loot_tables/cvill/mob/brewer.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:experience_bottle", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 2 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/data/incendium/loot_tables/cvill/mob/guard.json b/data/incendium/loot_tables/cvill/mob/guard.json new file mode 100644 index 0000000..d82a858 --- /dev/null +++ b/data/incendium/loot_tables/cvill/mob/guard.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:cooked_porkchop", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 2 + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:wooden_axe", + "functions": [ + { + "function": "minecraft:set_count", + "count": 1 + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/data/incendium/loot_tables/cvill/mob/lumberjack.json b/data/incendium/loot_tables/cvill/mob/lumberjack.json new file mode 100644 index 0000000..d4cc0cf --- /dev/null +++ b/data/incendium/loot_tables/cvill/mob/lumberjack.json @@ -0,0 +1,38 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:cooked_porkchop", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 2 + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 2, + "name": "minecraft:stick", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 6 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/data/incendium/loot_tables/cvill/mob/miner.json b/data/incendium/loot_tables/cvill/mob/miner.json new file mode 100644 index 0000000..29f3d42 --- /dev/null +++ b/data/incendium/loot_tables/cvill/mob/miner.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:quartz", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/data/incendium/loot_tables/cvill/wood.json b/data/incendium/loot_tables/cvill/wood.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/entity/dune_blaze.json b/data/incendium/loot_tables/entity/dune_blaze.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/entity/sentry.json b/data/incendium/loot_tables/entity/sentry.json old mode 100755 new mode 100644 index a882ae9..75e0169 --- a/data/incendium/loot_tables/entity/sentry.json +++ b/data/incendium/loot_tables/entity/sentry.json @@ -5,7 +5,7 @@ "entries": [ { "type": "minecraft:item", - "name": "book", + "name": "minecraft:book", "functions": [ { "function": "minecraft:enchant_with_levels", @@ -32,14 +32,22 @@ { "type": "minecraft:loot_table", "name": "incendium:artifact/tool/torch_of_lunacy", - "weight": 1, "conditions": [ { "condition": "minecraft:random_chance", - "chance": 0.08 + "chance": 0.7 } ] } + ], + "conditions": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "nbt": "{Tags:[\"in.prime_sentry\"]}" + } + } ] } ] diff --git a/data/incendium/loot_tables/entity/spirit.json b/data/incendium/loot_tables/entity/spirit.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/entity/withered_skeleton.json b/data/incendium/loot_tables/entity/withered_skeleton.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/ghastling.json b/data/incendium/loot_tables/ghastling.json old mode 100755 new mode 100644 index 089de5b..d623d5c --- a/data/incendium/loot_tables/ghastling.json +++ b/data/incendium/loot_tables/ghastling.json @@ -15,7 +15,7 @@ "function": "minecraft:set_name", "entity": "this", "name": { - "translate": "Ghastling", + "translate": "%1$s%4733088$s","with":["Ghastling",{"translate":"incendium.item.ghastling_egg.name"}], "color": "#ddafaf", "italic": false } @@ -25,17 +25,17 @@ "entity": "this", "lore": [ { - "translate": "Destroys ghast fireballs that it can see.", + "translate": "%1$s%4733088$s","with":["Destroys ghast fireballs that it can see.",{"translate":"incendium.item.ghastling_egg.desc1"}], "color": "#bbbbbb", "italic": false }, { - "translate": "Loves to eat fire charges.", + "translate": "%1$s%4733088$s","with":["Loves to eat fire charges.",{"translate":"incendium.item.ghastling_egg.desc2"}], "color": "#b4b4b4", "italic": false }, { - "translate": "Loyal but lazy", + "translate": "%1$s%4733088$s","with":["Loyal but lazy",{"translate":"incendium.item.ghastling_egg.desc3"}], "color": "#b4b4b4", "italic": false } diff --git a/data/incendium/loot_tables/hovering_inferno.json b/data/incendium/loot_tables/hovering_inferno.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/hovering_inferno/extras.json b/data/incendium/loot_tables/hovering_inferno/extras.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/iron_nuggets.json b/data/incendium/loot_tables/iron_nuggets.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/lab/basalt.json b/data/incendium/loot_tables/lab/basalt.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/lab/junk.json b/data/incendium/loot_tables/lab/junk.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/lab/piglin_loot.json b/data/incendium/loot_tables/lab/piglin_loot.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/lab/rare.json b/data/incendium/loot_tables/lab/rare.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/lab/treasure.json b/data/incendium/loot_tables/lab/treasure.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/phantom/hopper.json b/data/incendium/loot_tables/phantom/hopper.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/steam/base/common.json b/data/incendium/loot_tables/pipeline/base/common.json old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/loot_tables/steam/base/common.json rename to data/incendium/loot_tables/pipeline/base/common.json diff --git a/data/incendium/loot_tables/steam/base/junk.json b/data/incendium/loot_tables/pipeline/base/junk.json old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/loot_tables/steam/base/junk.json rename to data/incendium/loot_tables/pipeline/base/junk.json diff --git a/data/incendium/loot_tables/steam/base/rare.json b/data/incendium/loot_tables/pipeline/base/rare.json old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/loot_tables/steam/base/rare.json rename to data/incendium/loot_tables/pipeline/base/rare.json diff --git a/data/incendium/loot_tables/steam/base/treasure.json b/data/incendium/loot_tables/pipeline/base/treasure.json old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/loot_tables/steam/base/treasure.json rename to data/incendium/loot_tables/pipeline/base/treasure.json diff --git a/data/incendium/loot_tables/steam/base/uncommon.json b/data/incendium/loot_tables/pipeline/base/uncommon.json old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/loot_tables/steam/base/uncommon.json rename to data/incendium/loot_tables/pipeline/base/uncommon.json diff --git a/data/incendium/loot_tables/steam/common.json b/data/incendium/loot_tables/pipeline/common.json old mode 100755 new mode 100644 similarity index 67% rename from data/incendium/loot_tables/steam/common.json rename to data/incendium/loot_tables/pipeline/common.json index bbaaf52..0f3c6c3 --- a/data/incendium/loot_tables/steam/common.json +++ b/data/incendium/loot_tables/pipeline/common.json @@ -5,22 +5,22 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "incendium:steam/base/junk", + "name": "incendium:pipeline/base/junk", "weight": 25 }, { "type": "minecraft:loot_table", - "name": "incendium:steam/base/common", + "name": "incendium:pipeline/base/common", "weight": 25 }, { "type": "minecraft:loot_table", - "name": "incendium:steam/base/uncommon", + "name": "incendium:pipeline/base/uncommon", "weight": 6 }, { "type": "minecraft:loot_table", - "name": "incendium:steam/base/rare", + "name": "incendium:pipeline/base/rare", "weight": 3 } ] diff --git a/data/incendium/loot_tables/steam/junk.json b/data/incendium/loot_tables/pipeline/junk.json old mode 100755 new mode 100644 similarity index 67% rename from data/incendium/loot_tables/steam/junk.json rename to data/incendium/loot_tables/pipeline/junk.json index 605114f..98a96f7 --- a/data/incendium/loot_tables/steam/junk.json +++ b/data/incendium/loot_tables/pipeline/junk.json @@ -5,22 +5,22 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "incendium:steam/base/junk", + "name": "incendium:pipeline/base/junk", "weight": 50 }, { "type": "minecraft:loot_table", - "name": "incendium:steam/base/common", + "name": "incendium:pipeline/base/common", "weight": 12 }, { "type": "minecraft:loot_table", - "name": "incendium:steam/base/uncommon", + "name": "incendium:pipeline/base/uncommon", "weight": 4 }, { "type": "minecraft:loot_table", - "name": "incendium:steam/base/rare", + "name": "incendium:pipeline/base/rare", "weight": 2 } ] diff --git a/data/incendium/loot_tables/steam/rare.json b/data/incendium/loot_tables/pipeline/rare.json old mode 100755 new mode 100644 similarity index 67% rename from data/incendium/loot_tables/steam/rare.json rename to data/incendium/loot_tables/pipeline/rare.json index d81176e..5c09185 --- a/data/incendium/loot_tables/steam/rare.json +++ b/data/incendium/loot_tables/pipeline/rare.json @@ -5,22 +5,22 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "incendium:steam/base/junk", + "name": "incendium:pipeline/base/junk", "weight": 5 }, { "type": "minecraft:loot_table", - "name": "incendium:steam/base/common", + "name": "incendium:pipeline/base/common", "weight": 10 }, { "type": "minecraft:loot_table", - "name": "incendium:steam/base/uncommon", + "name": "incendium:pipeline/base/uncommon", "weight": 20 }, { "type": "minecraft:loot_table", - "name": "incendium:steam/base/rare", + "name": "incendium:pipeline/base/rare", "weight": 30 } ] diff --git a/data/incendium/loot_tables/steam/treasure.json b/data/incendium/loot_tables/pipeline/treasure.json old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/loot_tables/steam/treasure.json rename to data/incendium/loot_tables/pipeline/treasure.json diff --git a/data/incendium/loot_tables/steam/uncommon.json b/data/incendium/loot_tables/pipeline/uncommon.json old mode 100755 new mode 100644 similarity index 67% rename from data/incendium/loot_tables/steam/uncommon.json rename to data/incendium/loot_tables/pipeline/uncommon.json index 1f61c1a..db3dce5 --- a/data/incendium/loot_tables/steam/uncommon.json +++ b/data/incendium/loot_tables/pipeline/uncommon.json @@ -5,22 +5,22 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "incendium:steam/base/junk", + "name": "incendium:pipeline/base/junk", "weight": 10 }, { "type": "minecraft:loot_table", - "name": "incendium:steam/base/common", + "name": "incendium:pipeline/base/common", "weight": 15 }, { "type": "minecraft:loot_table", - "name": "incendium:steam/base/uncommon", + "name": "incendium:pipeline/base/uncommon", "weight": 30 }, { "type": "minecraft:loot_table", - "name": "incendium:steam/base/rare", + "name": "incendium:pipeline/base/rare", "weight": 5 } ] diff --git a/data/incendium/loot_tables/quartz_flats/kitchen_basic.json b/data/incendium/loot_tables/quartz_flats/kitchen_basic.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/quartz_flats/kitchen_extra_treasure.json b/data/incendium/loot_tables/quartz_flats/kitchen_extra_treasure.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/quartz_flats/kitchen_junk.json b/data/incendium/loot_tables/quartz_flats/kitchen_junk.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/quartz_flats/kitchen_treasure.json b/data/incendium/loot_tables/quartz_flats/kitchen_treasure.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/reactor/junk.json b/data/incendium/loot_tables/reactor/junk.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/reactor/office.json b/data/incendium/loot_tables/reactor/office.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/reactor/office_treasure.json b/data/incendium/loot_tables/reactor/office_treasure.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/reactor/treasure.json b/data/incendium/loot_tables/reactor/treasure.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/reactor/waste.json b/data/incendium/loot_tables/reactor/waste.json old mode 100755 new mode 100644 index 6c9c56c..de5cf28 --- a/data/incendium/loot_tables/reactor/waste.json +++ b/data/incendium/loot_tables/reactor/waste.json @@ -140,7 +140,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Hazmat Helmet", + "translate": "%1$s%4733088$s","with":["Hazmat Helmet",{"translate":"incendium.item.hazmat.helmet.name"}], "color": "#44ff00", "italic": false } @@ -164,9 +164,15 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Protects the wearer from poison", + "translate": "%1$s%4733088$s","with":["Protects the wearer from poison",{"translate":"incendium.item.hazmat.suit.desc1"}], "color": "#77cc00", - "italic": "false" + "italic": true + }, + "", + { + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], + "color": "#FF8000", + "italic": true } ], "entity": "this" @@ -194,9 +200,15 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Protects the wearer from poison", + "translate": "%1$s%4733088$s","with":["Protects the wearer from poison",{"translate":"incendium.item.hazmat.suit.desc1"}], "color": "#77cc00", - "italic": "false" + "italic": true + }, + "", + { + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], + "color": "#FF8000", + "italic": true } ], "entity": "this" @@ -204,7 +216,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Hazmat Chestplate", + "translate": "%1$s%4733088$s","with":["Hazmat Chestplate",{"translate":"incendium.item.hazmat.chestplate.name"}], "color": "#44ff00", "italic": false } @@ -247,9 +259,15 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Protects the wearer from poison", + "translate": "%1$s%4733088$s","with":["Protects the wearer from poison",{"translate":"incendium.item.hazmat.suit.desc1"}], "color": "#77cc00", - "italic": "false" + "italic": true + }, + "", + { + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], + "color": "#FF8000", + "italic": true } ], "entity": "this" @@ -257,7 +275,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Hazmat Leggings", + "translate": "%1$s%4733088$s","with":["Hazmat Leggings",{"translate":"incendium.item.hazmat.leggings.name"}], "color": "#44ff00", "italic": false } @@ -300,9 +318,15 @@ "function": "minecraft:set_lore", "lore": [ { - "translate": "Protects the wearer from poison", + "translate": "%1$s%4733088$s","with":["Protects the wearer from poison",{"translate":"incendium.item.hazmat.suit.desc1"}], "color": "#77cc00", - "italic": "false" + "italic": true + }, + "", + { + "translate": "%1$s%4733088$s","with":["Incendium",{"translate":"incendium"}], + "color": "#FF8000", + "italic": true } ], "entity": "this" @@ -310,7 +334,7 @@ { "function": "minecraft:set_name", "name": { - "translate": "Hazmat Boots", + "translate": "%1$s%4733088$s","with":["Hazmat Boots",{"translate":"incendium.item.hazmat.boots.name"}], "color": "#44ff00", "italic": false } diff --git a/data/incendium/loot_tables/sanctum/banners.json b/data/incendium/loot_tables/sanctum/banners.json old mode 100755 new mode 100644 index 3ef0e01..260e1e6 --- a/data/incendium/loot_tables/sanctum/banners.json +++ b/data/incendium/loot_tables/sanctum/banners.json @@ -59,6 +59,11 @@ "weight": 100, "name": "minecraft:emerald" }, + { + "type": "minecraft:item", + "weight": 10, + "name": "minecraft:piglin_banner_pattern" + }, { "type": "minecraft:item", "weight": 5, diff --git a/data/incendium/loot_tables/sanctum/brewery.json b/data/incendium/loot_tables/sanctum/brewery.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/sanctum/coffin.json b/data/incendium/loot_tables/sanctum/coffin.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/sanctum/common_loot.json b/data/incendium/loot_tables/sanctum/common_loot.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/sanctum/junk_loot.json b/data/incendium/loot_tables/sanctum/junk_loot.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/sanctum/lower_loot.json b/data/incendium/loot_tables/sanctum/lower_loot.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/sanctum/potions.json b/data/incendium/loot_tables/sanctum/potions.json old mode 100755 new mode 100644 index b04c1c6..b991832 --- a/data/incendium/loot_tables/sanctum/potions.json +++ b/data/incendium/loot_tables/sanctum/potions.json @@ -8,26 +8,32 @@ "weight": 1, "name": "minecraft:potion", "functions": [ + { + "function": "minecraft:set_name", + "entity": "this", + "name": { + "translate": "%1$s%4733088$s","with":["Death Potion",{"translate":"incendium.item.death_pot.name"}], + "color": "#b20306", + "italic": false + } + }, { "function": "minecraft:set_lore", "lore": [ { - "text": " " - }, - { - "text": "Make your choice, adventurous stranger", + "translate": "%1$s%4733088$s","with":["Make your choice, adventurous stranger",{"translate":"incendium.item.death_pot.desc1"}], "color": "red" }, { - "text": "Drink the brew, and bide the danger,", + "translate": "%1$s%4733088$s","with":["Drink the brew, and bide the danger,",{"translate":"incendium.item.death_pot.desc2"}], "color": "red" }, { - "text": "Or wonder till it drives you mad;", + "translate": "%1$s%4733088$s","with":["Or wonder till it drives you mad;",{"translate":"incendium.item.death_pot.desc3"}], "color": "red" }, { - "text": "What would have happened if you had?", + "translate": "%1$s%4733088$s","with":["What would have happened if you had?",{"translate":"incendium.item.death_pot.desc4"}], "color": "red" } ] diff --git a/data/incendium/loot_tables/sanctum/potionsfull.json b/data/incendium/loot_tables/sanctum/potionsfull.json old mode 100755 new mode 100644 diff --git a/data/incendium/loot_tables/sanctum/tax_collector.json b/data/incendium/loot_tables/sanctum/tax_collector.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/air_above.json b/data/incendium/predicates/air_above.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/biome/ash_barrens.json b/data/incendium/predicates/biome/ash_barrens.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/biome/generic_biome.json b/data/incendium/predicates/biome/generic_biome.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/biome/has/spirit.json b/data/incendium/predicates/biome/has/spirit.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/biome/infernal_dunes.json b/data/incendium/predicates/biome/infernal_dunes.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/biome/quartz_flats.json b/data/incendium/predicates/biome/quartz_flats.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/biome/toxic_heap.json b/data/incendium/predicates/biome/toxic_heap.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/biome/volcanic_deltas.json b/data/incendium/predicates/biome/volcanic_deltas.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/biome/withered_forest.json b/data/incendium/predicates/biome/withered_forest.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/dimension/nether.json b/data/incendium/predicates/dimension/nether.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/dimension/overworld.json b/data/incendium/predicates/dimension/overworld.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/effects/absorption.json b/data/incendium/predicates/effects/absorption.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/effects/fire_resistance.json b/data/incendium/predicates/effects/fire_resistance.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/effects/invisibility.json b/data/incendium/predicates/effects/invisibility.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/effects/levitation.json b/data/incendium/predicates/effects/levitation.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/effects/on_fire.json b/data/incendium/predicates/effects/on_fire.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/effects/poison.json b/data/incendium/predicates/effects/poison.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/blazing_hatchet.json b/data/incendium/predicates/holding/blazing_hatchet.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/cake_batter.json b/data/incendium/predicates/holding/cake_batter.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/charm.json b/data/incendium/predicates/holding/charm.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/cheater_items.json b/data/incendium/predicates/holding/cheater_items.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/chilling_blade.json b/data/incendium/predicates/holding/chilling_blade.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/daybreaker.json b/data/incendium/predicates/holding/daybreaker.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/firestorm.json b/data/incendium/predicates/holding/firestorm.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/firestorm/mainhand.json b/data/incendium/predicates/holding/firestorm/mainhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/firestorm/offhand.json b/data/incendium/predicates/holding/firestorm/offhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/greatsword_of_sacrifice.json b/data/incendium/predicates/holding/greatsword_of_sacrifice.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/hefty_pickaxe.json b/data/incendium/predicates/holding/hefty_pickaxe.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/holy_wrath.json b/data/incendium/predicates/holding/holy_wrath.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/item.json b/data/incendium/predicates/holding/item.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/loaded.json b/data/incendium/predicates/holding/loaded.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/loaded/mainhand.json b/data/incendium/predicates/holding/loaded/mainhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/loaded/offhand.json b/data/incendium/predicates/holding/loaded/offhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/loaded_spectral_arrow.json b/data/incendium/predicates/holding/loaded_spectral_arrow.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/loaded_spectral_arrow/mainhand.json b/data/incendium/predicates/holding/loaded_spectral_arrow/mainhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/loaded_spectral_arrow/offhand.json b/data/incendium/predicates/holding/loaded_spectral_arrow/offhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/multiplex_crossbow.json b/data/incendium/predicates/holding/multiplex_crossbow.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/necrotic_shield.json b/data/incendium/predicates/holding/necrotic_shield.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/prismatic_shield.json b/data/incendium/predicates/holding/prismatic_shield.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/quick_charge/mainhand.json b/data/incendium/predicates/holding/quick_charge/mainhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/quick_charge/offhand.json b/data/incendium/predicates/holding/quick_charge/offhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/radiation_shield.json b/data/incendium/predicates/holding/radiation_shield.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/ragnarok.json b/data/incendium/predicates/holding/ragnarok.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/ragnarok/mainhand.json b/data/incendium/predicates/holding/ragnarok/mainhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/ragnarok/offhand.json b/data/incendium/predicates/holding/ragnarok/offhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/scarlet_dagger.json b/data/incendium/predicates/holding/scarlet_dagger.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/scroll_of_returning.json b/data/incendium/predicates/holding/scroll_of_returning.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/scroll_of_returning/mainhand.json b/data/incendium/predicates/holding/scroll_of_returning/mainhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/scroll_of_returning/offhand.json b/data/incendium/predicates/holding/scroll_of_returning/offhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/sentrys_wrath.json b/data/incendium/predicates/holding/sentrys_wrath.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/sentrys_wrath/mainhand.json b/data/incendium/predicates/holding/sentrys_wrath/mainhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/sentrys_wrath/offhand.json b/data/incendium/predicates/holding/sentrys_wrath/offhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/shield/mainhand.json b/data/incendium/predicates/holding/shield/mainhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/shield/mainhand_no_durability.json b/data/incendium/predicates/holding/shield/mainhand_no_durability.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/shield/offhand.json b/data/incendium/predicates/holding/shield/offhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/shield/offhand_no_durability.json b/data/incendium/predicates/holding/shield/offhand_no_durability.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/torch_of_lunacy.json b/data/incendium/predicates/holding/torch_of_lunacy.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/totem_of_undying.json b/data/incendium/predicates/holding/totem_of_undying.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/trailblazer.json b/data/incendium/predicates/holding/trailblazer.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/trailblazer/mainhand.json b/data/incendium/predicates/holding/trailblazer/mainhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/trailblazer/offhand.json b/data/incendium/predicates/holding/trailblazer/offhand.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/unstable_powder.json b/data/incendium/predicates/holding/unstable_powder.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/voltaic_trident.json b/data/incendium/predicates/holding/voltaic_trident.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/warping_witherblade.json b/data/incendium/predicates/holding/warping_witherblade.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/holding/withersbane.json b/data/incendium/predicates/holding/withersbane.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/matching/eid.json b/data/incendium/predicates/matching/eid.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/matching/trident_id.json b/data/incendium/predicates/matching/trident_id.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/other/hidden_debris.json b/data/incendium/predicates/other/hidden_debris.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/other/in_portal.json b/data/incendium/predicates/other/in_portal.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/player/sneaking.json b/data/incendium/predicates/player/sneaking.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/0_001.json b/data/incendium/predicates/random/0_001.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/0_01.json b/data/incendium/predicates/random/0_01.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/0_04.json b/data/incendium/predicates/random/0_04.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/0_05.json b/data/incendium/predicates/random/0_05.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/0_2.json b/data/incendium/predicates/random/0_2.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/0_4.json b/data/incendium/predicates/random/0_4.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/0_5.json b/data/incendium/predicates/random/0_5.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/1.json b/data/incendium/predicates/random/1.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/10.json b/data/incendium/predicates/random/10.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/12.json b/data/incendium/predicates/random/12.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/15.json b/data/incendium/predicates/random/15.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/2.json b/data/incendium/predicates/random/2.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/20.json b/data/incendium/predicates/random/20.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/25.json b/data/incendium/predicates/random/25.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/30.json b/data/incendium/predicates/random/30.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/35.json b/data/incendium/predicates/random/35.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/3_5.json b/data/incendium/predicates/random/3_5.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/40.json b/data/incendium/predicates/random/40.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/5.json b/data/incendium/predicates/random/5.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/50.json b/data/incendium/predicates/random/50.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/6.json b/data/incendium/predicates/random/6.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/60.json b/data/incendium/predicates/random/60.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/7.json b/data/incendium/predicates/random/7.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/70.json b/data/incendium/predicates/random/70.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/75.json b/data/incendium/predicates/random/75.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/77.json b/data/incendium/predicates/random/77.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/8.json b/data/incendium/predicates/random/8.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/80.json b/data/incendium/predicates/random/80.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/85.json b/data/incendium/predicates/random/85.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/87.json b/data/incendium/predicates/random/87.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/90.json b/data/incendium/predicates/random/90.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/95.json b/data/incendium/predicates/random/95.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/96.json b/data/incendium/predicates/random/96.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/97.json b/data/incendium/predicates/random/97.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/98.json b/data/incendium/predicates/random/98.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/99.json b/data/incendium/predicates/random/99.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/other/1_x.json b/data/incendium/predicates/random/other/1_x.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/random/other/x.json b/data/incendium/predicates/random/other/x.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/structure/any.json b/data/incendium/predicates/structure/any.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/structure/forbidden_castle.json b/data/incendium/predicates/structure/forbidden_castle.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/structure/fortress.json b/data/incendium/predicates/structure/fortress.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/structure/infernal_altar.json b/data/incendium/predicates/structure/infernal_altar.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/structure/nether_reactor.json b/data/incendium/predicates/structure/nether_reactor.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/structure/piglin_village.json b/data/incendium/predicates/structure/piglin_village.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/structure/pipeline.json b/data/incendium/predicates/structure/pipeline.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/structure/ruined_lab.json b/data/incendium/predicates/structure/ruined_lab.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/structure/sanctum.json b/data/incendium/predicates/structure/sanctum.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/wearing/chainmail.json b/data/incendium/predicates/wearing/chainmail.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/wearing/hazmat.json b/data/incendium/predicates/wearing/hazmat.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/wearing/infernal_feather.json b/data/incendium/predicates/wearing/infernal_feather.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/wearing/nothing.json b/data/incendium/predicates/wearing/nothing.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/wearing/scouts_battle_helm.json b/data/incendium/predicates/wearing/scouts_battle_helm.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/weather/raining.json b/data/incendium/predicates/weather/raining.json old mode 100755 new mode 100644 diff --git a/data/incendium/predicates/weather/thunder.json b/data/incendium/predicates/weather/thunder.json old mode 100755 new mode 100644 diff --git a/data/incendium/recipes/upgrade_elytra.json b/data/incendium/recipes/upgrade_elytra.json old mode 100755 new mode 100644 diff --git a/data/incendium/structure_icons.json b/data/incendium/structure_icons.json new file mode 100644 index 0000000..7d7d5ad --- /dev/null +++ b/data/incendium/structure_icons.json @@ -0,0 +1,11 @@ +{ + "incendium:abandoned_tower": "minecraft:ghast_tear", + "incendium:forbidden_castle": "minecraft:gold_block", + "incendium:infernal_altar": "minecraft:lectern", + "incendium:nether_reactor": "minecraft:tnt", + "incendium:piglin_village": "minecraft:crimson_stairs", + "incendium:pipeline": "minecraft:soul_torch", + "incendium:quartz_kitchen": "minecraft:cake", + "incendium:ruined_lab": "minecraft:piston", + "incendium:sanctum": "minecraft:quartz_bricks" +} \ No newline at end of file diff --git a/data/incendium/structures/arena.nbt b/data/incendium/structures/arena.nbt old mode 100755 new mode 100644 index 8372207..0a7c711 Binary files a/data/incendium/structures/arena.nbt and b/data/incendium/structures/arena.nbt differ diff --git a/data/incendium/structures/castle/boom_room.nbt b/data/incendium/structures/castle/boom_room.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/bridges/bridge1.nbt b/data/incendium/structures/castle/bridges/bridge1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/bridges/bridge_2.nbt b/data/incendium/structures/castle/bridges/bridge_2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/bridges/bridge_broken.nbt b/data/incendium/structures/castle/bridges/bridge_broken.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/bridges/bridge_long.nbt b/data/incendium/structures/castle/bridges/bridge_long.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/alcove1.nbt b/data/incendium/structures/castle/corridor/alcove1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/alcove10.nbt b/data/incendium/structures/castle/corridor/alcove10.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/alcove11.nbt b/data/incendium/structures/castle/corridor/alcove11.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/alcove12.nbt b/data/incendium/structures/castle/corridor/alcove12.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/alcove13.nbt b/data/incendium/structures/castle/corridor/alcove13.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/alcove14.nbt b/data/incendium/structures/castle/corridor/alcove14.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/alcove2.nbt b/data/incendium/structures/castle/corridor/alcove2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/alcove3.nbt b/data/incendium/structures/castle/corridor/alcove3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/alcove4.nbt b/data/incendium/structures/castle/corridor/alcove4.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/alcove5.nbt b/data/incendium/structures/castle/corridor/alcove5.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/alcove6.nbt b/data/incendium/structures/castle/corridor/alcove6.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/alcove7.nbt b/data/incendium/structures/castle/corridor/alcove7.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/alcove8.nbt b/data/incendium/structures/castle/corridor/alcove8.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/alcove9.nbt b/data/incendium/structures/castle/corridor/alcove9.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/corridor1.nbt b/data/incendium/structures/castle/corridor/corridor1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/corridor/corridor2.nbt b/data/incendium/structures/castle/corridor/corridor2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/courtyard_1x1.nbt b/data/incendium/structures/castle/courtyard_1x1.nbt deleted file mode 100755 index 6f04c25..0000000 Binary files a/data/incendium/structures/castle/courtyard_1x1.nbt and /dev/null differ diff --git a/data/incendium/structures/castle/courtyard_2x1.nbt b/data/incendium/structures/castle/courtyard_2x1.nbt deleted file mode 100755 index 033b275..0000000 Binary files a/data/incendium/structures/castle/courtyard_2x1.nbt and /dev/null differ diff --git a/data/incendium/structures/castle/courtyards/courtyard_1x1.nbt b/data/incendium/structures/castle/courtyards/courtyard_1x1.nbt new file mode 100644 index 0000000..f44e509 Binary files /dev/null and b/data/incendium/structures/castle/courtyards/courtyard_1x1.nbt differ diff --git a/data/incendium/structures/castle/courtyards/courtyard_2x1.nbt b/data/incendium/structures/castle/courtyards/courtyard_2x1.nbt new file mode 100644 index 0000000..2b50f95 Binary files /dev/null and b/data/incendium/structures/castle/courtyards/courtyard_2x1.nbt differ diff --git a/data/incendium/structures/castle/courtyards/crimson_1.nbt b/data/incendium/structures/castle/courtyards/crimson_1.nbt old mode 100755 new mode 100644 index bc988d2..0c9a573 Binary files a/data/incendium/structures/castle/courtyards/crimson_1.nbt and b/data/incendium/structures/castle/courtyards/crimson_1.nbt differ diff --git a/data/incendium/structures/castle/courtyards/crimson_2.nbt b/data/incendium/structures/castle/courtyards/crimson_2.nbt old mode 100755 new mode 100644 index 4df815b..ad6bfa9 Binary files a/data/incendium/structures/castle/courtyards/crimson_2.nbt and b/data/incendium/structures/castle/courtyards/crimson_2.nbt differ diff --git a/data/incendium/structures/castle/garden_2x1.nbt b/data/incendium/structures/castle/courtyards/garden_2x1.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/garden_2x1.nbt rename to data/incendium/structures/castle/courtyards/garden_2x1.nbt diff --git a/data/incendium/structures/castle/decor/artifact/hero.nbt b/data/incendium/structures/castle/decor/artifact/hero.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/cage1.nbt b/data/incendium/structures/castle/decor/brewing/cage1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/cage2.nbt b/data/incendium/structures/castle/decor/brewing/cage2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/cage3.nbt b/data/incendium/structures/castle/decor/brewing/cage3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/farm1.nbt b/data/incendium/structures/castle/decor/brewing/farm1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/farm1_w.nbt b/data/incendium/structures/castle/decor/brewing/farm1_w.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/farm2.nbt b/data/incendium/structures/castle/decor/brewing/farm2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/farm2_w.nbt b/data/incendium/structures/castle/decor/brewing/farm2_w.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/farm3.nbt b/data/incendium/structures/castle/decor/brewing/farm3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/farm3_w.nbt b/data/incendium/structures/castle/decor/brewing/farm3_w.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/stand1.nbt b/data/incendium/structures/castle/decor/brewing/stand1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/stand2.nbt b/data/incendium/structures/castle/decor/brewing/stand2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/stand3.nbt b/data/incendium/structures/castle/decor/brewing/stand3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/stand4.nbt b/data/incendium/structures/castle/decor/brewing/stand4.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/stand5.nbt b/data/incendium/structures/castle/decor/brewing/stand5.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/stand6.nbt b/data/incendium/structures/castle/decor/brewing/stand6.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/table1.nbt b/data/incendium/structures/castle/decor/brewing/table1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/table1_w.nbt b/data/incendium/structures/castle/decor/brewing/table1_w.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/table2.nbt b/data/incendium/structures/castle/decor/brewing/table2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/brewing/table2_w.nbt b/data/incendium/structures/castle/decor/brewing/table2_w.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/crossroads/decor1.nbt b/data/incendium/structures/castle/decor/crossroads/decor1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/crossroads/decor2.nbt b/data/incendium/structures/castle/decor/crossroads/decor2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/farms/farm1.nbt b/data/incendium/structures/castle/decor/farms/farm1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/farms/farm2.nbt b/data/incendium/structures/castle/decor/farms/farm2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/farms/farm3.nbt b/data/incendium/structures/castle/decor/farms/farm3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/farms/farm4.nbt b/data/incendium/structures/castle/decor/farms/farm4.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lights/ceiling2.nbt b/data/incendium/structures/castle/decor/lights/ceiling2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lights/ceiling3.nbt b/data/incendium/structures/castle/decor/lights/ceiling3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lights/ceiling4.nbt b/data/incendium/structures/castle/decor/lights/ceiling4.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lights/ceiling5.nbt b/data/incendium/structures/castle/decor/lights/ceiling5.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lights/ceiling6.nbt b/data/incendium/structures/castle/decor/lights/ceiling6.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lights/ceiling7.nbt b/data/incendium/structures/castle/decor/lights/ceiling7.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lights/soul2.nbt b/data/incendium/structures/castle/decor/lights/soul2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lights/soul3.nbt b/data/incendium/structures/castle/decor/lights/soul3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lights/soul4.nbt b/data/incendium/structures/castle/decor/lights/soul4.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lumber/barrel_big1.nbt b/data/incendium/structures/castle/decor/lumber/barrel_big1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lumber/barrel_big2.nbt b/data/incendium/structures/castle/decor/lumber/barrel_big2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lumber/barrel_big3.nbt b/data/incendium/structures/castle/decor/lumber/barrel_big3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lumber/barrel_small1.nbt b/data/incendium/structures/castle/decor/lumber/barrel_small1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lumber/barrel_small2.nbt b/data/incendium/structures/castle/decor/lumber/barrel_small2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lumber/barrel_small3.nbt b/data/incendium/structures/castle/decor/lumber/barrel_small3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lumber/c1.nbt b/data/incendium/structures/castle/decor/lumber/c1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lumber/c2.nbt b/data/incendium/structures/castle/decor/lumber/c2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lumber/c3.nbt b/data/incendium/structures/castle/decor/lumber/c3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lumber/w1.nbt b/data/incendium/structures/castle/decor/lumber/w1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lumber/w2.nbt b/data/incendium/structures/castle/decor/lumber/w2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/lumber/w3.nbt b/data/incendium/structures/castle/decor/lumber/w3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/saplings_b.nbt b/data/incendium/structures/castle/decor/saplings_b.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/saplings_big.nbt b/data/incendium/structures/castle/decor/saplings_big.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/saplings_small.nbt b/data/incendium/structures/castle/decor/saplings_small.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/storage/barrel1.nbt b/data/incendium/structures/castle/decor/storage/barrel1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/storage/barrel2.nbt b/data/incendium/structures/castle/decor/storage/barrel2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/storage/barrel3.nbt b/data/incendium/structures/castle/decor/storage/barrel3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/storage/light1.nbt b/data/incendium/structures/castle/decor/storage/light1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/storage/light2.nbt b/data/incendium/structures/castle/decor/storage/light2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/storage/logs1.nbt b/data/incendium/structures/castle/decor/storage/logs1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/storage/logs2.nbt b/data/incendium/structures/castle/decor/storage/logs2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/storage/logs3.nbt b/data/incendium/structures/castle/decor/storage/logs3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/storage/logs4.nbt b/data/incendium/structures/castle/decor/storage/logs4.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/tables/table1.nbt b/data/incendium/structures/castle/decor/tables/table1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/tables/table2.nbt b/data/incendium/structures/castle/decor/tables/table2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/tables/table_small1.nbt b/data/incendium/structures/castle/decor/tables/table_small1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/tables/table_small2.nbt b/data/incendium/structures/castle/decor/tables/table_small2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/tables/table_small3.nbt b/data/incendium/structures/castle/decor/tables/table_small3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/treasure/bomb.nbt b/data/incendium/structures/castle/decor/treasure/bomb.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/treasure/bomb2.nbt b/data/incendium/structures/castle/decor/treasure/bomb2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/treasure/bomb3.nbt b/data/incendium/structures/castle/decor/treasure/bomb3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/treasure/quartz/statue1.nbt b/data/incendium/structures/castle/decor/treasure/quartz/statue1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/treasure/quartz/statue2.nbt b/data/incendium/structures/castle/decor/treasure/quartz/statue2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/decor/treasure/quartz/statue3.nbt b/data/incendium/structures/castle/decor/treasure/quartz/statue3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/1x1_l1.nbt b/data/incendium/structures/castle/floors/1x1_l1.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/1x1_l1.nbt rename to data/incendium/structures/castle/floors/1x1_l1.nbt diff --git a/data/incendium/structures/castle/1x1_l2.nbt b/data/incendium/structures/castle/floors/1x1_l2.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/1x1_l2.nbt rename to data/incendium/structures/castle/floors/1x1_l2.nbt diff --git a/data/incendium/structures/castle/1x1_l2a.nbt b/data/incendium/structures/castle/floors/1x1_l2a.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/1x1_l2a.nbt rename to data/incendium/structures/castle/floors/1x1_l2a.nbt diff --git a/data/incendium/structures/castle/1x1_l3.nbt b/data/incendium/structures/castle/floors/1x1_l3.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/1x1_l3.nbt rename to data/incendium/structures/castle/floors/1x1_l3.nbt diff --git a/data/incendium/structures/castle/2x1_l2.nbt b/data/incendium/structures/castle/floors/2x1_l2.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/2x1_l2.nbt rename to data/incendium/structures/castle/floors/2x1_l2.nbt diff --git a/data/incendium/structures/castle/2x1_l2_forced.nbt b/data/incendium/structures/castle/floors/2x1_l2_forced.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/2x1_l2_forced.nbt rename to data/incendium/structures/castle/floors/2x1_l2_forced.nbt diff --git a/data/incendium/structures/castle/2x1_l2_gatepiece.nbt b/data/incendium/structures/castle/floors/2x1_l2_gatepiece.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/2x1_l2_gatepiece.nbt rename to data/incendium/structures/castle/floors/2x1_l2_gatepiece.nbt diff --git a/data/incendium/structures/castle/2x1_l3.nbt b/data/incendium/structures/castle/floors/2x1_l3.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/2x1_l3.nbt rename to data/incendium/structures/castle/floors/2x1_l3.nbt diff --git a/data/incendium/structures/castle/2x1_l3_alt.nbt b/data/incendium/structures/castle/floors/2x1_l3_alt.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/2x1_l3_alt.nbt rename to data/incendium/structures/castle/floors/2x1_l3_alt.nbt diff --git a/data/incendium/structures/castle/2x1_l3_forced.nbt b/data/incendium/structures/castle/floors/2x1_l3_forced.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/2x1_l3_forced.nbt rename to data/incendium/structures/castle/floors/2x1_l3_forced.nbt diff --git a/data/incendium/structures/castle/2x2_l2.nbt b/data/incendium/structures/castle/floors/2x2_l2.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/2x2_l2.nbt rename to data/incendium/structures/castle/floors/2x2_l2.nbt diff --git a/data/incendium/structures/castle/2x2_l3.nbt b/data/incendium/structures/castle/floors/2x2_l3.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/2x2_l3.nbt rename to data/incendium/structures/castle/floors/2x2_l3.nbt diff --git a/data/incendium/structures/castle/2x2_l3_alt.nbt b/data/incendium/structures/castle/floors/2x2_l3_alt.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/2x2_l3_alt.nbt rename to data/incendium/structures/castle/floors/2x2_l3_alt.nbt diff --git a/data/incendium/structures/castle/3x1_l2.nbt b/data/incendium/structures/castle/floors/3x1_l2.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/3x1_l2.nbt rename to data/incendium/structures/castle/floors/3x1_l2.nbt diff --git a/data/incendium/structures/castle/house_1x1.nbt b/data/incendium/structures/castle/house_1x1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/house_2x1.nbt b/data/incendium/structures/castle/house_2x1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/marker.nbt b/data/incendium/structures/castle/marker.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/mobs/alchemist.nbt b/data/incendium/structures/castle/mobs/alchemist.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/mobs/archer.nbt b/data/incendium/structures/castle/mobs/archer.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/mobs/blacksmith.nbt b/data/incendium/structures/castle/mobs/blacksmith.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/mobs/knight.nbt b/data/incendium/structures/castle/mobs/knight.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/mobs/knight_diamond.nbt b/data/incendium/structures/castle/mobs/knight_diamond.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/mobs/knight_gold.nbt b/data/incendium/structures/castle/mobs/knight_gold.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/mobs/knight_guard.nbt b/data/incendium/structures/castle/mobs/knight_guard.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/mobs/knight_iron.nbt b/data/incendium/structures/castle/mobs/knight_iron.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/mobs/knight_netherite.nbt b/data/incendium/structures/castle/mobs/knight_netherite.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/mobs/knight_r.nbt b/data/incendium/structures/castle/mobs/knight_r.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/mobs/pyromancer.nbt b/data/incendium/structures/castle/mobs/pyromancer.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/mobs/scout.nbt b/data/incendium/structures/castle/mobs/scout.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/mobs/shock_troop.nbt b/data/incendium/structures/castle/mobs/shock_troop.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/remedy/10.nbt b/data/incendium/structures/castle/remedy/10.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/remedy/15.nbt b/data/incendium/structures/castle/remedy/15.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/roof_1x1.nbt b/data/incendium/structures/castle/roofs/roof_1x1.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_1x1.nbt rename to data/incendium/structures/castle/roofs/roof_1x1.nbt diff --git a/data/incendium/structures/castle/roof_1x1_1.nbt b/data/incendium/structures/castle/roofs/roof_1x1_1.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_1x1_1.nbt rename to data/incendium/structures/castle/roofs/roof_1x1_1.nbt diff --git a/data/incendium/structures/castle/roof_1x1_2.nbt b/data/incendium/structures/castle/roofs/roof_1x1_2.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_1x1_2.nbt rename to data/incendium/structures/castle/roofs/roof_1x1_2.nbt diff --git a/data/incendium/structures/castle/roof_1x1_3.nbt b/data/incendium/structures/castle/roofs/roof_1x1_3.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_1x1_3.nbt rename to data/incendium/structures/castle/roofs/roof_1x1_3.nbt diff --git a/data/incendium/structures/castle/roof_1x1_4.nbt b/data/incendium/structures/castle/roofs/roof_1x1_4.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_1x1_4.nbt rename to data/incendium/structures/castle/roofs/roof_1x1_4.nbt diff --git a/data/incendium/structures/castle/roof_1x1_5.nbt b/data/incendium/structures/castle/roofs/roof_1x1_5.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_1x1_5.nbt rename to data/incendium/structures/castle/roofs/roof_1x1_5.nbt diff --git a/data/incendium/structures/castle/roof_1x1_6.nbt b/data/incendium/structures/castle/roofs/roof_1x1_6.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_1x1_6.nbt rename to data/incendium/structures/castle/roofs/roof_1x1_6.nbt diff --git a/data/incendium/structures/castle/roof_1x1_7.nbt b/data/incendium/structures/castle/roofs/roof_1x1_7.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_1x1_7.nbt rename to data/incendium/structures/castle/roofs/roof_1x1_7.nbt diff --git a/data/incendium/structures/castle/roof_1x1_8.nbt b/data/incendium/structures/castle/roofs/roof_1x1_8.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_1x1_8.nbt rename to data/incendium/structures/castle/roofs/roof_1x1_8.nbt diff --git a/data/incendium/structures/castle/roof_1x1_short1.nbt b/data/incendium/structures/castle/roofs/roof_1x1_short1.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_1x1_short1.nbt rename to data/incendium/structures/castle/roofs/roof_1x1_short1.nbt diff --git a/data/incendium/structures/castle/roof_1x1_short1_big.nbt b/data/incendium/structures/castle/roofs/roof_1x1_short1_big.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_1x1_short1_big.nbt rename to data/incendium/structures/castle/roofs/roof_1x1_short1_big.nbt diff --git a/data/incendium/structures/castle/roof_1x1_short1_hoglin.nbt b/data/incendium/structures/castle/roofs/roof_1x1_short1_hoglin.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_1x1_short1_hoglin.nbt rename to data/incendium/structures/castle/roofs/roof_1x1_short1_hoglin.nbt diff --git a/data/incendium/structures/castle/roof_1x1_short2.nbt b/data/incendium/structures/castle/roofs/roof_1x1_short2.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_1x1_short2.nbt rename to data/incendium/structures/castle/roofs/roof_1x1_short2.nbt diff --git a/data/incendium/structures/castle/roof_1x1_short2_big.nbt b/data/incendium/structures/castle/roofs/roof_1x1_short2_big.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_1x1_short2_big.nbt rename to data/incendium/structures/castle/roofs/roof_1x1_short2_big.nbt diff --git a/data/incendium/structures/castle/roof_2x1.nbt b/data/incendium/structures/castle/roofs/roof_2x1.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_2x1.nbt rename to data/incendium/structures/castle/roofs/roof_2x1.nbt diff --git a/data/incendium/structures/castle/roof_2x1_1.nbt b/data/incendium/structures/castle/roofs/roof_2x1_1.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_2x1_1.nbt rename to data/incendium/structures/castle/roofs/roof_2x1_1.nbt diff --git a/data/incendium/structures/castle/roof_2x1_2.nbt b/data/incendium/structures/castle/roofs/roof_2x1_2.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_2x1_2.nbt rename to data/incendium/structures/castle/roofs/roof_2x1_2.nbt diff --git a/data/incendium/structures/castle/roof_2x1_3.nbt b/data/incendium/structures/castle/roofs/roof_2x1_3.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_2x1_3.nbt rename to data/incendium/structures/castle/roofs/roof_2x1_3.nbt diff --git a/data/incendium/structures/castle/roof_2x1_4.nbt b/data/incendium/structures/castle/roofs/roof_2x1_4.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_2x1_4.nbt rename to data/incendium/structures/castle/roofs/roof_2x1_4.nbt diff --git a/data/incendium/structures/castle/roof_2x1_special_farm.nbt b/data/incendium/structures/castle/roofs/roof_2x1_special_farm.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_2x1_special_farm.nbt rename to data/incendium/structures/castle/roofs/roof_2x1_special_farm.nbt diff --git a/data/incendium/structures/castle/roof_2x1_special_farm_warped.nbt b/data/incendium/structures/castle/roofs/roof_2x1_special_farm_warped.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/roof_2x1_special_farm_warped.nbt rename to data/incendium/structures/castle/roofs/roof_2x1_special_farm_warped.nbt diff --git a/data/incendium/structures/castle/rooms/1x1/archery_tower.nbt b/data/incendium/structures/castle/rooms/1x1/archery_tower.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/armory_1.nbt b/data/incendium/structures/castle/rooms/1x1/armory_1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/brewing.nbt b/data/incendium/structures/castle/rooms/1x1/brewing.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/brewing_w.nbt b/data/incendium/structures/castle/rooms/1x1/brewing_w.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/cell.nbt b/data/incendium/structures/castle/rooms/1x1/cell.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/coolant_room.nbt b/data/incendium/structures/castle/rooms/1x1/coolant_room.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/corridors.nbt b/data/incendium/structures/castle/rooms/1x1/corridors.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/crossroads1.nbt b/data/incendium/structures/castle/rooms/1x1/crossroads1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/cryostasis_chamber.nbt b/data/incendium/structures/castle/rooms/1x1/cryostasis_chamber.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/dining.nbt b/data/incendium/structures/castle/rooms/1x1/dining.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/kitchen.nbt b/data/incendium/structures/castle/rooms/1x1/kitchen.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/livq1.nbt b/data/incendium/structures/castle/rooms/1x1/livq1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/livq2.nbt b/data/incendium/structures/castle/rooms/1x1/livq2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/ocean_portal.nbt b/data/incendium/structures/castle/rooms/1x1/ocean_portal.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/odd_treasure.nbt b/data/incendium/structures/castle/rooms/1x1/odd_treasure.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/pig_ben.nbt b/data/incendium/structures/castle/rooms/1x1/pig_ben.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/pig_ben_small.nbt b/data/incendium/structures/castle/rooms/1x1/pig_ben_small.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/pigstep.nbt b/data/incendium/structures/castle/rooms/1x1/pigstep.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/strider_pen.nbt b/data/incendium/structures/castle/rooms/1x1/strider_pen.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/trap_room.nbt b/data/incendium/structures/castle/rooms/1x1/trap_room.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/trap_room_old.nbt b/data/incendium/structures/castle/rooms/1x1/trap_room_old.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/treasure_netherite.nbt b/data/incendium/structures/castle/rooms/1x1/treasure_netherite.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/very_normal_room.nbt b/data/incendium/structures/castle/rooms/1x1/very_normal_room.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/1x1/very_normal_room_2.nbt b/data/incendium/structures/castle/rooms/1x1/very_normal_room_2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/blacksmith.nbt b/data/incendium/structures/castle/rooms/2x1/blacksmith.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/boom_room.nbt b/data/incendium/structures/castle/rooms/2x1/boom_room.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/crypt.nbt b/data/incendium/structures/castle/rooms/2x1/crypt.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/end_city.nbt b/data/incendium/structures/castle/rooms/2x1/end_city.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/lab.nbt b/data/incendium/structures/castle/rooms/2x1/lab.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/library.nbt b/data/incendium/structures/castle/rooms/2x1/library.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/lumber_c.nbt b/data/incendium/structures/castle/rooms/2x1/lumber_c.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/lumber_w.nbt b/data/incendium/structures/castle/rooms/2x1/lumber_w.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/portal.nbt b/data/incendium/structures/castle/rooms/2x1/portal.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/pyro.nbt b/data/incendium/structures/castle/rooms/2x1/pyro.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/stable.nbt b/data/incendium/structures/castle/rooms/2x1/stable.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/staircase.nbt b/data/incendium/structures/castle/rooms/2x1/staircase.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/storage.nbt b/data/incendium/structures/castle/rooms/2x1/storage.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/treasure_quartz.nbt b/data/incendium/structures/castle/rooms/2x1/treasure_quartz.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/void_miniboss.nbt b/data/incendium/structures/castle/rooms/2x1/void_miniboss.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x1/war_table.nbt b/data/incendium/structures/castle/rooms/2x1/war_table.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x2/crimson_greenhouse.nbt b/data/incendium/structures/castle/rooms/2x2/crimson_greenhouse.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x2/magma_room.nbt b/data/incendium/structures/castle/rooms/2x2/magma_room.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x2/phantom.nbt b/data/incendium/structures/castle/rooms/2x2/phantom.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x2/round_table.nbt b/data/incendium/structures/castle/rooms/2x2/round_table.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x2/sentry_lab.nbt b/data/incendium/structures/castle/rooms/2x2/sentry_lab.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x2/throne_room.nbt b/data/incendium/structures/castle/rooms/2x2/throne_room.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x2/warped_greenhouse.nbt b/data/incendium/structures/castle/rooms/2x2/warped_greenhouse.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/rooms/2x2/warped_greenhouse_broken.nbt b/data/incendium/structures/castle/rooms/2x2/warped_greenhouse_broken.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/staircase_aligning_block.nbt b/data/incendium/structures/castle/staircase_aligning_block.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/statues/king_intact1.nbt b/data/incendium/structures/castle/statues/king_intact1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/statues/king_ruined1.nbt b/data/incendium/structures/castle/statues/king_ruined1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/statues/old_king_broken1.nbt b/data/incendium/structures/castle/statues/old_king_broken1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/statues/old_king_broken2.nbt b/data/incendium/structures/castle/statues/old_king_broken2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/statues/old_king_intact1.nbt b/data/incendium/structures/castle/statues/old_king_intact1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/statues/small1.nbt b/data/incendium/structures/castle/statues/small1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/statues/small2.nbt b/data/incendium/structures/castle/statues/small2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/statues/small3.nbt b/data/incendium/structures/castle/statues/small3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/statues/small4.nbt b/data/incendium/structures/castle/statues/small4.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/statues/small5.nbt b/data/incendium/structures/castle/statues/small5.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/statue_2x2.nbt b/data/incendium/structures/castle/statues/statue_2x2.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/statue_2x2.nbt rename to data/incendium/structures/castle/statues/statue_2x2.nbt diff --git a/data/incendium/structures/castle/strider/pool1.nbt b/data/incendium/structures/castle/strider/pool1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/strider/pool2.nbt b/data/incendium/structures/castle/strider/pool2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/strider/pool3.nbt b/data/incendium/structures/castle/strider/pool3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/strider/pool4.nbt b/data/incendium/structures/castle/strider/pool4.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/tower_backup.nbt b/data/incendium/structures/castle/tower/tower_backup.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/tower_backup.nbt rename to data/incendium/structures/castle/tower/tower_backup.nbt diff --git a/data/incendium/structures/castle/tower_base.nbt b/data/incendium/structures/castle/tower/tower_base.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/tower_base.nbt rename to data/incendium/structures/castle/tower/tower_base.nbt diff --git a/data/incendium/structures/castle/tower_d1.nbt b/data/incendium/structures/castle/tower/tower_d1.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/tower_d1.nbt rename to data/incendium/structures/castle/tower/tower_d1.nbt diff --git a/data/incendium/structures/castle/tower_d2.nbt b/data/incendium/structures/castle/tower/tower_d2.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/tower_d2.nbt rename to data/incendium/structures/castle/tower/tower_d2.nbt diff --git a/data/incendium/structures/castle/tower_main.nbt b/data/incendium/structures/castle/tower/tower_main.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/tower_main.nbt rename to data/incendium/structures/castle/tower/tower_main.nbt diff --git a/data/incendium/structures/castle/tower_main_top.nbt b/data/incendium/structures/castle/tower/tower_main_top.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/tower_main_top.nbt rename to data/incendium/structures/castle/tower/tower_main_top.nbt diff --git a/data/incendium/structures/castle/tower_small.nbt b/data/incendium/structures/castle/tower/tower_small.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/tower_small.nbt rename to data/incendium/structures/castle/tower/tower_small.nbt diff --git a/data/incendium/structures/castle/tower_small_w.nbt b/data/incendium/structures/castle/tower/tower_small_w.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/tower_small_w.nbt rename to data/incendium/structures/castle/tower/tower_small_w.nbt diff --git a/data/incendium/structures/castle/tower/decor1.nbt b/data/incendium/structures/castle/tower_decor/decor1.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/tower/decor1.nbt rename to data/incendium/structures/castle/tower_decor/decor1.nbt diff --git a/data/incendium/structures/castle/tower/decor2.nbt b/data/incendium/structures/castle/tower_decor/decor2.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/tower/decor2.nbt rename to data/incendium/structures/castle/tower_decor/decor2.nbt diff --git a/data/incendium/structures/castle/tower/decor3.nbt b/data/incendium/structures/castle/tower_decor/decor3.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/tower/decor3.nbt rename to data/incendium/structures/castle/tower_decor/decor3.nbt diff --git a/data/incendium/structures/castle/tower/decor4.nbt b/data/incendium/structures/castle/tower_decor/decor4.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/tower/decor4.nbt rename to data/incendium/structures/castle/tower_decor/decor4.nbt diff --git a/data/incendium/structures/castle/tower/decor5.nbt b/data/incendium/structures/castle/tower_decor/decor5.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/tower/decor5.nbt rename to data/incendium/structures/castle/tower_decor/decor5.nbt diff --git a/data/incendium/structures/castle/tower/decor6.nbt b/data/incendium/structures/castle/tower_decor/decor6.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/tower/decor6.nbt rename to data/incendium/structures/castle/tower_decor/decor6.nbt diff --git a/data/incendium/structures/castle/tower_floor/base1.nbt b/data/incendium/structures/castle/tower_floor/base1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/castle/wall/decor1.nbt b/data/incendium/structures/castle/wall_decor/decor1.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/wall/decor1.nbt rename to data/incendium/structures/castle/wall_decor/decor1.nbt diff --git a/data/incendium/structures/castle/wall/decor2.nbt b/data/incendium/structures/castle/wall_decor/decor2.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/wall/decor2.nbt rename to data/incendium/structures/castle/wall_decor/decor2.nbt diff --git a/data/incendium/structures/castle/wall/decor3.nbt b/data/incendium/structures/castle/wall_decor/decor3.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/wall/decor3.nbt rename to data/incendium/structures/castle/wall_decor/decor3.nbt diff --git a/data/incendium/structures/castle/wall/decor4.nbt b/data/incendium/structures/castle/wall_decor/decor4.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/wall/decor4.nbt rename to data/incendium/structures/castle/wall_decor/decor4.nbt diff --git a/data/incendium/structures/castle/wall/decor5.nbt b/data/incendium/structures/castle/wall_decor/decor5.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/wall/decor5.nbt rename to data/incendium/structures/castle/wall_decor/decor5.nbt diff --git a/data/incendium/structures/castle/wall/decor6.nbt b/data/incendium/structures/castle/wall_decor/decor6.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/wall/decor6.nbt rename to data/incendium/structures/castle/wall_decor/decor6.nbt diff --git a/data/incendium/structures/castle/wall_10.nbt b/data/incendium/structures/castle/walls/wall_10.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/wall_10.nbt rename to data/incendium/structures/castle/walls/wall_10.nbt diff --git a/data/incendium/structures/castle/wall_15.nbt b/data/incendium/structures/castle/walls/wall_15.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/wall_15.nbt rename to data/incendium/structures/castle/walls/wall_15.nbt diff --git a/data/incendium/structures/castle/wall_15_compat.nbt b/data/incendium/structures/castle/walls/wall_15_compat.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/wall_15_compat.nbt rename to data/incendium/structures/castle/walls/wall_15_compat.nbt diff --git a/data/incendium/structures/castle/wall_15w.nbt b/data/incendium/structures/castle/walls/wall_15w.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/wall_15w.nbt rename to data/incendium/structures/castle/walls/wall_15w.nbt diff --git a/data/incendium/structures/castle/wall_corner.nbt b/data/incendium/structures/castle/walls/wall_corner.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/wall_corner.nbt rename to data/incendium/structures/castle/walls/wall_corner.nbt diff --git a/data/incendium/structures/castle/wall_gate.nbt b/data/incendium/structures/castle/walls/wall_gate.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/wall_gate.nbt rename to data/incendium/structures/castle/walls/wall_gate.nbt diff --git a/data/incendium/structures/castle/wall_gate2.nbt b/data/incendium/structures/castle/walls/wall_gate2.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/wall_gate2.nbt rename to data/incendium/structures/castle/walls/wall_gate2.nbt diff --git a/data/incendium/structures/castle/wall_gate3.nbt b/data/incendium/structures/castle/walls/wall_gate3.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/wall_gate3.nbt rename to data/incendium/structures/castle/walls/wall_gate3.nbt diff --git a/data/incendium/structures/castle/wall_gate_skull.nbt b/data/incendium/structures/castle/walls/wall_gate_skull.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/castle/wall_gate_skull.nbt rename to data/incendium/structures/castle/walls/wall_gate_skull.nbt diff --git a/data/incendium/structures/church/ext1.nbt b/data/incendium/structures/church/ext1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/church/glass_basalt_deltas.nbt b/data/incendium/structures/church/glass_basalt_deltas.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/church/glass_crimson_forest.nbt b/data/incendium/structures/church/glass_crimson_forest.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/church/glass_infernal_dunes.nbt b/data/incendium/structures/church/glass_infernal_dunes.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/church/glass_nether_wastes.nbt b/data/incendium/structures/church/glass_nether_wastes.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/church/glass_quartz_flats.nbt b/data/incendium/structures/church/glass_quartz_flats.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/church/glass_ssv.nbt b/data/incendium/structures/church/glass_ssv.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/church/glass_toxic_heap.nbt b/data/incendium/structures/church/glass_toxic_heap.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/church/glass_voltaic_heap.nbt b/data/incendium/structures/church/glass_voltaic_heap.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/church/glass_warped_forest.nbt b/data/incendium/structures/church/glass_warped_forest.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/church/glass_withered_forest.nbt b/data/incendium/structures/church/glass_withered_forest.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/garden1.nbt b/data/incendium/structures/cvill/houses/garden1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/garden2.nbt b/data/incendium/structures/cvill/houses/garden2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/garden3.nbt b/data/incendium/structures/cvill/houses/garden3.nbt old mode 100755 new mode 100644 index 61e03d1..baad9ad Binary files a/data/incendium/structures/cvill/houses/garden3.nbt and b/data/incendium/structures/cvill/houses/garden3.nbt differ diff --git a/data/incendium/structures/cvill/houses/large1.nbt b/data/incendium/structures/cvill/houses/large1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/large2.nbt b/data/incendium/structures/cvill/houses/large2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/large3.nbt b/data/incendium/structures/cvill/houses/large3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/large4.nbt b/data/incendium/structures/cvill/houses/large4.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/large5.nbt b/data/incendium/structures/cvill/houses/large5.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/large6.nbt b/data/incendium/structures/cvill/houses/large6.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/large7.nbt b/data/incendium/structures/cvill/houses/large7.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/large8.nbt b/data/incendium/structures/cvill/houses/large8.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/small1.nbt b/data/incendium/structures/cvill/houses/small1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/small2.nbt b/data/incendium/structures/cvill/houses/small2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/small3.nbt b/data/incendium/structures/cvill/houses/small3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/small4.nbt b/data/incendium/structures/cvill/houses/small4.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/small5.nbt b/data/incendium/structures/cvill/houses/small5.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/houses/small6.nbt b/data/incendium/structures/cvill/houses/small6.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/inter1.nbt b/data/incendium/structures/cvill/inter1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/inter2.nbt b/data/incendium/structures/cvill/inter2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/inter3.nbt b/data/incendium/structures/cvill/inter3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/inter4.nbt b/data/incendium/structures/cvill/inter4.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/inter5.nbt b/data/incendium/structures/cvill/inter5.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/inter6.nbt b/data/incendium/structures/cvill/inter6.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/large6.nbt b/data/incendium/structures/cvill/large6.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/mobs/piglin_alchemist1.nbt b/data/incendium/structures/cvill/mobs/piglin_alchemist1.nbt old mode 100755 new mode 100644 index 4f54e54..3d80427 Binary files a/data/incendium/structures/cvill/mobs/piglin_alchemist1.nbt and b/data/incendium/structures/cvill/mobs/piglin_alchemist1.nbt differ diff --git a/data/incendium/structures/cvill/mobs/piglin_armored.nbt b/data/incendium/structures/cvill/mobs/piglin_armored.nbt old mode 100755 new mode 100644 index b425844..bca0250 Binary files a/data/incendium/structures/cvill/mobs/piglin_armored.nbt and b/data/incendium/structures/cvill/mobs/piglin_armored.nbt differ diff --git a/data/incendium/structures/cvill/mobs/piglin_lumberjack1.nbt b/data/incendium/structures/cvill/mobs/piglin_lumberjack1.nbt old mode 100755 new mode 100644 index 590ed3d..5b3a067 Binary files a/data/incendium/structures/cvill/mobs/piglin_lumberjack1.nbt and b/data/incendium/structures/cvill/mobs/piglin_lumberjack1.nbt differ diff --git a/data/incendium/structures/cvill/mobs/piglin_lumberjack2.nbt b/data/incendium/structures/cvill/mobs/piglin_lumberjack2.nbt old mode 100755 new mode 100644 index 5c610fc..bce5256 Binary files a/data/incendium/structures/cvill/mobs/piglin_lumberjack2.nbt and b/data/incendium/structures/cvill/mobs/piglin_lumberjack2.nbt differ diff --git a/data/incendium/structures/cvill/mobs/piglin_miner1.nbt b/data/incendium/structures/cvill/mobs/piglin_miner1.nbt old mode 100755 new mode 100644 index eff9dea..64b3cb3 Binary files a/data/incendium/structures/cvill/mobs/piglin_miner1.nbt and b/data/incendium/structures/cvill/mobs/piglin_miner1.nbt differ diff --git a/data/incendium/structures/cvill/mobs/piglin_worker1.nbt b/data/incendium/structures/cvill/mobs/piglin_worker1.nbt old mode 100755 new mode 100644 index cde32e0..681fbfa Binary files a/data/incendium/structures/cvill/mobs/piglin_worker1.nbt and b/data/incendium/structures/cvill/mobs/piglin_worker1.nbt differ diff --git a/data/incendium/structures/cvill/road1.nbt b/data/incendium/structures/cvill/road1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/road10.nbt b/data/incendium/structures/cvill/road10.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/road11.nbt b/data/incendium/structures/cvill/road11.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/road2.nbt b/data/incendium/structures/cvill/road2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/road3.nbt b/data/incendium/structures/cvill/road3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/road4.nbt b/data/incendium/structures/cvill/road4.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/road5.nbt b/data/incendium/structures/cvill/road5.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/road6.nbt b/data/incendium/structures/cvill/road6.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/road7.nbt b/data/incendium/structures/cvill/road7.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/road8.nbt b/data/incendium/structures/cvill/road8.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/road9.nbt b/data/incendium/structures/cvill/road9.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/stilt1.nbt b/data/incendium/structures/cvill/stilt1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/towncenter1.nbt b/data/incendium/structures/cvill/towncenter1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/towncenter2.nbt b/data/incendium/structures/cvill/towncenter2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/towncenter3.nbt b/data/incendium/structures/cvill/towncenter3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/cvill/towncenter4.nbt b/data/incendium/structures/cvill/towncenter4.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/blazecastle_1.nbt b/data/incendium/structures/old/blazecastle_1.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/blazecastle_1.nbt rename to data/incendium/structures/old/blazecastle_1.nbt diff --git a/data/incendium/structures/blazecastle_1_ext1.nbt b/data/incendium/structures/old/blazecastle_1_ext1.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/blazecastle_1_ext1.nbt rename to data/incendium/structures/old/blazecastle_1_ext1.nbt diff --git a/data/incendium/structures/blazecastle_1_ext2.nbt b/data/incendium/structures/old/blazecastle_1_ext2.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/blazecastle_1_ext2.nbt rename to data/incendium/structures/old/blazecastle_1_ext2.nbt diff --git a/data/incendium/structures/phantom/extension.nbt b/data/incendium/structures/phantom/extension.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/phantom/hive1.nbt b/data/incendium/structures/phantom/hive1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/phantom/hive2.nbt b/data/incendium/structures/phantom/hive2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/phantom/hive3.nbt b/data/incendium/structures/phantom/hive3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/phantom/main_hive.nbt b/data/incendium/structures/phantom/main_hive.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/phantom/ribbon1.nbt b/data/incendium/structures/phantom/ribbon1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/phantom/ribbon2.nbt b/data/incendium/structures/phantom/ribbon2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/phantom/ribbon3.nbt b/data/incendium/structures/phantom/ribbon3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/phantom/ribbon4.nbt b/data/incendium/structures/phantom/ribbon4.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/phantom/ribbon5.nbt b/data/incendium/structures/phantom/ribbon5.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/phantom/ribbon6.nbt b/data/incendium/structures/phantom/ribbon6.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/phantom/ribbon7.nbt b/data/incendium/structures/phantom/ribbon7.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/phantom/ribbon8.nbt b/data/incendium/structures/phantom/ribbon8.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/steam/large_h.nbt b/data/incendium/structures/pipeline/large_h.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/steam/large_h.nbt rename to data/incendium/structures/pipeline/large_h.nbt diff --git a/data/incendium/structures/pipeline/large_hv.nbt b/data/incendium/structures/pipeline/large_hv.nbt new file mode 100644 index 0000000..c475a71 Binary files /dev/null and b/data/incendium/structures/pipeline/large_hv.nbt differ diff --git a/data/incendium/structures/steam/large_v.nbt b/data/incendium/structures/pipeline/large_v.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/steam/large_v.nbt rename to data/incendium/structures/pipeline/large_v.nbt diff --git a/data/incendium/structures/pipeline/large_vh.nbt b/data/incendium/structures/pipeline/large_vh.nbt new file mode 100644 index 0000000..af288ad Binary files /dev/null and b/data/incendium/structures/pipeline/large_vh.nbt differ diff --git a/data/incendium/structures/pipeline/small_4way.nbt b/data/incendium/structures/pipeline/small_4way.nbt new file mode 100644 index 0000000..58b4d2d Binary files /dev/null and b/data/incendium/structures/pipeline/small_4way.nbt differ diff --git a/data/incendium/structures/steam/small_h_elbow.nbt b/data/incendium/structures/pipeline/small_h_elbow.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/steam/small_h_elbow.nbt rename to data/incendium/structures/pipeline/small_h_elbow.nbt diff --git a/data/incendium/structures/steam/small_h_end.nbt b/data/incendium/structures/pipeline/small_h_end.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/steam/small_h_end.nbt rename to data/incendium/structures/pipeline/small_h_end.nbt diff --git a/data/incendium/structures/pipeline/small_h_long.nbt b/data/incendium/structures/pipeline/small_h_long.nbt new file mode 100644 index 0000000..63cdb50 Binary files /dev/null and b/data/incendium/structures/pipeline/small_h_long.nbt differ diff --git a/data/incendium/structures/steam/small_h_s.nbt b/data/incendium/structures/pipeline/small_h_s.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/steam/small_h_s.nbt rename to data/incendium/structures/pipeline/small_h_s.nbt diff --git a/data/incendium/structures/pipeline/small_h_t.nbt b/data/incendium/structures/pipeline/small_h_t.nbt new file mode 100644 index 0000000..cb7f59c Binary files /dev/null and b/data/incendium/structures/pipeline/small_h_t.nbt differ diff --git a/data/incendium/structures/steam/small_hv.nbt b/data/incendium/structures/pipeline/small_hv.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/steam/small_hv.nbt rename to data/incendium/structures/pipeline/small_hv.nbt diff --git a/data/incendium/structures/steam/small_t_hv.nbt b/data/incendium/structures/pipeline/small_t_hv.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/steam/small_t_hv.nbt rename to data/incendium/structures/pipeline/small_t_hv.nbt diff --git a/data/incendium/structures/steam/small_t_vh.nbt b/data/incendium/structures/pipeline/small_t_vh.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/steam/small_t_vh.nbt rename to data/incendium/structures/pipeline/small_t_vh.nbt diff --git a/data/incendium/structures/steam/small_v.nbt b/data/incendium/structures/pipeline/small_v.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/steam/small_v.nbt rename to data/incendium/structures/pipeline/small_v.nbt diff --git a/data/incendium/structures/pipeline/small_v_end.nbt b/data/incendium/structures/pipeline/small_v_end.nbt new file mode 100644 index 0000000..ce00529 Binary files /dev/null and b/data/incendium/structures/pipeline/small_v_end.nbt differ diff --git a/data/incendium/structures/steam/small_v_tall.nbt b/data/incendium/structures/pipeline/small_v_tall.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/steam/small_v_tall.nbt rename to data/incendium/structures/pipeline/small_v_tall.nbt diff --git a/data/incendium/structures/steam/small_vh.nbt b/data/incendium/structures/pipeline/small_vh.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/steam/small_vh.nbt rename to data/incendium/structures/pipeline/small_vh.nbt diff --git a/data/incendium/structures/pipeline/start1.nbt b/data/incendium/structures/pipeline/start1.nbt new file mode 100644 index 0000000..859a862 Binary files /dev/null and b/data/incendium/structures/pipeline/start1.nbt differ diff --git a/data/incendium/structures/pipeline/starter1.nbt b/data/incendium/structures/pipeline/starter1.nbt new file mode 100644 index 0000000..fe4427c Binary files /dev/null and b/data/incendium/structures/pipeline/starter1.nbt differ diff --git a/data/incendium/structures/pipeline/starter2.nbt b/data/incendium/structures/pipeline/starter2.nbt new file mode 100644 index 0000000..ba4e1ab Binary files /dev/null and b/data/incendium/structures/pipeline/starter2.nbt differ diff --git a/data/incendium/structures/quartz_flats/bone1.nbt b/data/incendium/structures/quartz_flats/bone1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/quartz_flats/bone2.nbt b/data/incendium/structures/quartz_flats/bone2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/quartz_flats/bone3.nbt b/data/incendium/structures/quartz_flats/bone3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/quartz_flats/decor_small1.nbt b/data/incendium/structures/quartz_flats/decor_small1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/quartz_flats/dungeon1.nbt b/data/incendium/structures/quartz_flats/dungeon1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/quartz_flats/dungeon2.nbt b/data/incendium/structures/quartz_flats/dungeon2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/quartz_flats/quartz_kitchen.nbt b/data/incendium/structures/quartz_flats/quartz_kitchen.nbt new file mode 100644 index 0000000..17f6235 Binary files /dev/null and b/data/incendium/structures/quartz_flats/quartz_kitchen.nbt differ diff --git a/data/incendium/structures/quartz_tower.nbt b/data/incendium/structures/quartz_flats/quartz_tower.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/quartz_tower.nbt rename to data/incendium/structures/quartz_flats/quartz_tower.nbt diff --git a/data/incendium/structures/quartz_tower1.nbt b/data/incendium/structures/quartz_flats/quartz_tower1.nbt similarity index 81% rename from data/incendium/structures/quartz_tower1.nbt rename to data/incendium/structures/quartz_flats/quartz_tower1.nbt index 3784aea..b4b7355 100644 Binary files a/data/incendium/structures/quartz_tower1.nbt and b/data/incendium/structures/quartz_flats/quartz_tower1.nbt differ diff --git a/data/incendium/structures/quartz_tower2.nbt b/data/incendium/structures/quartz_flats/quartz_tower2.nbt similarity index 81% rename from data/incendium/structures/quartz_tower2.nbt rename to data/incendium/structures/quartz_flats/quartz_tower2.nbt index 86ea92b..227d481 100644 Binary files a/data/incendium/structures/quartz_tower2.nbt and b/data/incendium/structures/quartz_flats/quartz_tower2.nbt differ diff --git a/data/incendium/structures/quartz_tower3.nbt b/data/incendium/structures/quartz_flats/quartz_tower3.nbt similarity index 81% rename from data/incendium/structures/quartz_tower3.nbt rename to data/incendium/structures/quartz_flats/quartz_tower3.nbt index 07da7ca..85f66dc 100644 Binary files a/data/incendium/structures/quartz_tower3.nbt and b/data/incendium/structures/quartz_flats/quartz_tower3.nbt differ diff --git a/data/incendium/structures/quartz_flats/road1.nbt b/data/incendium/structures/quartz_flats/road1.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/quartz_flats/road2.nbt b/data/incendium/structures/quartz_flats/road2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/quartz_flats/road3.nbt b/data/incendium/structures/quartz_flats/road3.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/quartz_flats/sanctum.nbt b/data/incendium/structures/quartz_flats/sanctum.nbt new file mode 100644 index 0000000..389be5b Binary files /dev/null and b/data/incendium/structures/quartz_flats/sanctum.nbt differ diff --git a/data/incendium/structures/sanctum2.nbt b/data/incendium/structures/quartz_flats/sanctum2.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/sanctum2.nbt rename to data/incendium/structures/quartz_flats/sanctum2.nbt diff --git a/data/incendium/structures/quartz_flats/small_tower.nbt b/data/incendium/structures/quartz_flats/small_tower.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/quartz_flats/well.nbt b/data/incendium/structures/quartz_flats/well.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/quartz_kitchen.nbt b/data/incendium/structures/quartz_kitchen.nbt deleted file mode 100755 index 41c07e0..0000000 Binary files a/data/incendium/structures/quartz_kitchen.nbt and /dev/null differ diff --git a/data/incendium/structures/reactor.nbt b/data/incendium/structures/reactor.nbt deleted file mode 100755 index a855e74..0000000 Binary files a/data/incendium/structures/reactor.nbt and /dev/null differ diff --git a/data/incendium/structures/reactor/reactor.nbt b/data/incendium/structures/reactor/reactor.nbt new file mode 100644 index 0000000..c9ec289 Binary files /dev/null and b/data/incendium/structures/reactor/reactor.nbt differ diff --git a/data/incendium/structures/reactor/reactor_bottom.nbt b/data/incendium/structures/reactor/reactor_bottom.nbt new file mode 100644 index 0000000..b9c0230 Binary files /dev/null and b/data/incendium/structures/reactor/reactor_bottom.nbt differ diff --git a/data/incendium/structures/reactor/reactor_east.nbt b/data/incendium/structures/reactor/reactor_east.nbt new file mode 100644 index 0000000..94d2aa9 Binary files /dev/null and b/data/incendium/structures/reactor/reactor_east.nbt differ diff --git a/data/incendium/structures/reactor/reactor_last.nbt b/data/incendium/structures/reactor/reactor_last.nbt new file mode 100644 index 0000000..59cfa37 Binary files /dev/null and b/data/incendium/structures/reactor/reactor_last.nbt differ diff --git a/data/incendium/structures/reactor/reactor_south.nbt b/data/incendium/structures/reactor/reactor_south.nbt new file mode 100644 index 0000000..f0bf9dd Binary files /dev/null and b/data/incendium/structures/reactor/reactor_south.nbt differ diff --git a/data/incendium/structures/reactor/reactor_top.nbt b/data/incendium/structures/reactor/reactor_top.nbt new file mode 100644 index 0000000..2eefb9c Binary files /dev/null and b/data/incendium/structures/reactor/reactor_top.nbt differ diff --git a/data/incendium/structures/reactor_top1.nbt b/data/incendium/structures/reactor/reactor_top1.nbt old mode 100755 new mode 100644 similarity index 100% rename from data/incendium/structures/reactor_top1.nbt rename to data/incendium/structures/reactor/reactor_top1.nbt diff --git a/data/incendium/structures/reactor_bottom.nbt b/data/incendium/structures/reactor_bottom.nbt deleted file mode 100755 index 4ef1202..0000000 Binary files a/data/incendium/structures/reactor_bottom.nbt and /dev/null differ diff --git a/data/incendium/structures/reactor_east.nbt b/data/incendium/structures/reactor_east.nbt deleted file mode 100755 index d693d46..0000000 Binary files a/data/incendium/structures/reactor_east.nbt and /dev/null differ diff --git a/data/incendium/structures/reactor_last.nbt b/data/incendium/structures/reactor_last.nbt deleted file mode 100755 index 0f0dabe..0000000 Binary files a/data/incendium/structures/reactor_last.nbt and /dev/null differ diff --git a/data/incendium/structures/reactor_south.nbt b/data/incendium/structures/reactor_south.nbt deleted file mode 100755 index 4771d77..0000000 Binary files a/data/incendium/structures/reactor_south.nbt and /dev/null differ diff --git a/data/incendium/structures/reactor_top.nbt b/data/incendium/structures/reactor_top.nbt deleted file mode 100755 index e252583..0000000 Binary files a/data/incendium/structures/reactor_top.nbt and /dev/null differ diff --git a/data/incendium/structures/sanctum.nbt b/data/incendium/structures/sanctum.nbt deleted file mode 100755 index 512ca4b..0000000 Binary files a/data/incendium/structures/sanctum.nbt and /dev/null differ diff --git a/data/incendium/structures/steam/large_hv.nbt b/data/incendium/structures/steam/large_hv.nbt deleted file mode 100755 index 2343f89..0000000 Binary files a/data/incendium/structures/steam/large_hv.nbt and /dev/null differ diff --git a/data/incendium/structures/steam/large_vh.nbt b/data/incendium/structures/steam/large_vh.nbt deleted file mode 100755 index 17d5c34..0000000 Binary files a/data/incendium/structures/steam/large_vh.nbt and /dev/null differ diff --git a/data/incendium/structures/steam/small_4way.nbt b/data/incendium/structures/steam/small_4way.nbt deleted file mode 100755 index d491247..0000000 Binary files a/data/incendium/structures/steam/small_4way.nbt and /dev/null differ diff --git a/data/incendium/structures/steam/small_h_long.nbt b/data/incendium/structures/steam/small_h_long.nbt deleted file mode 100755 index e60b7df..0000000 Binary files a/data/incendium/structures/steam/small_h_long.nbt and /dev/null differ diff --git a/data/incendium/structures/steam/small_h_t.nbt b/data/incendium/structures/steam/small_h_t.nbt deleted file mode 100755 index a553618..0000000 Binary files a/data/incendium/structures/steam/small_h_t.nbt and /dev/null differ diff --git a/data/incendium/structures/steam/small_v_end.nbt b/data/incendium/structures/steam/small_v_end.nbt deleted file mode 100755 index fbf2b20..0000000 Binary files a/data/incendium/structures/steam/small_v_end.nbt and /dev/null differ diff --git a/data/incendium/structures/steam/start1.nbt b/data/incendium/structures/steam/start1.nbt deleted file mode 100755 index 32c45ce..0000000 Binary files a/data/incendium/structures/steam/start1.nbt and /dev/null differ diff --git a/data/incendium/structures/steam/starter1.nbt b/data/incendium/structures/steam/starter1.nbt deleted file mode 100755 index c3c6586..0000000 Binary files a/data/incendium/structures/steam/starter1.nbt and /dev/null differ diff --git a/data/incendium/structures/steam/starter2.nbt b/data/incendium/structures/steam/starter2.nbt deleted file mode 100755 index 7ec3e07..0000000 Binary files a/data/incendium/structures/steam/starter2.nbt and /dev/null differ diff --git a/data/incendium/structures/the_lab.nbt b/data/incendium/structures/the_lab.nbt new file mode 100644 index 0000000..9a8d64f Binary files /dev/null and b/data/incendium/structures/the_lab.nbt differ diff --git a/data/incendium/structures/tower_main.nbt b/data/incendium/structures/tower_main.nbt deleted file mode 100755 index 516effd..0000000 Binary files a/data/incendium/structures/tower_main.nbt and /dev/null differ diff --git a/data/incendium/structures/wither/arena.nbt b/data/incendium/structures/wither/arena.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/wither/corruption.nbt b/data/incendium/structures/wither/corruption.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/wither/corruption2.nbt b/data/incendium/structures/wither/corruption2.nbt old mode 100755 new mode 100644 diff --git a/data/incendium/structures/wither_cage.nbt b/data/incendium/structures/wither_cage.nbt deleted file mode 100755 index cf6db2c..0000000 Binary files a/data/incendium/structures/wither_cage.nbt and /dev/null differ diff --git a/data/incendium/tags/blocks/airs.json b/data/incendium/tags/blocks/airs.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/basalt.json b/data/incendium/tags/blocks/basalt.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/basalt_replace.json b/data/incendium/tags/blocks/basalt_replace.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/bedrock.json b/data/incendium/tags/blocks/bedrock.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/black_concrete.json b/data/incendium/tags/blocks/black_concrete.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/bsn_no_basalt.json b/data/incendium/tags/blocks/bsn_no_basalt.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/dunes.json b/data/incendium/tags/blocks/dunes.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/ices.json b/data/incendium/tags/blocks/ices.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/knight_immune.json b/data/incendium/tags/blocks/knight_immune.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/nether_blocks.json b/data/incendium/tags/blocks/nether_blocks.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/nether_blocks_air.json b/data/incendium/tags/blocks/nether_blocks_air.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/nether_blocks_no_air.json b/data/incendium/tags/blocks/nether_blocks_no_air.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/nether_wart_block.json b/data/incendium/tags/blocks/nether_wart_block.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/netherrack.json b/data/incendium/tags/blocks/netherrack.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/red_sandstone.json b/data/incendium/tags/blocks/red_sandstone.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/smashables.json b/data/incendium/tags/blocks/smashables.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/smooth_basalt.json b/data/incendium/tags/blocks/smooth_basalt.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/smooth_basalt_only.json b/data/incendium/tags/blocks/smooth_basalt_only.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/soil_sand.json b/data/incendium/tags/blocks/soil_sand.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/soul_blocks.json b/data/incendium/tags/blocks/soul_blocks.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/soul_sand.json b/data/incendium/tags/blocks/soul_sand.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/ssv_ceiling.json b/data/incendium/tags/blocks/ssv_ceiling.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/ssv_soil_ceiling.json b/data/incendium/tags/blocks/ssv_soil_ceiling.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/toxic_surface.json b/data/incendium/tags/blocks/toxic_surface.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/blocks/warped_wart_block.json b/data/incendium/tags/blocks/warped_wart_block.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/entity_types/ghastling_enemy.json b/data/incendium/tags/entity_types/ghastling_enemy.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/entity_types/mobs.json b/data/incendium/tags/entity_types/mobs.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/entity_types/mobs_no_player.json b/data/incendium/tags/entity_types/mobs_no_player.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/entity_types/sentry_targets.json b/data/incendium/tags/entity_types/sentry_targets.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/entity_types/withersbane_targets.json b/data/incendium/tags/entity_types/withersbane_targets.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/items/armor.json b/data/incendium/tags/items/armor.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/items/blackstone_blocks.json b/data/incendium/tags/items/blackstone_blocks.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/items/brewing_ingredients.json b/data/incendium/tags/items/brewing_ingredients.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/items/gold_stackable.json b/data/incendium/tags/items/gold_stackable.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/items/gold_unstackable.json b/data/incendium/tags/items/gold_unstackable.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/items/iron_stackable.json b/data/incendium/tags/items/iron_stackable.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/items/smooth_stone_crafting_materials.json b/data/incendium/tags/items/smooth_stone_crafting_materials.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/items/tools.json b/data/incendium/tags/items/tools.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/items/tools_armor.json b/data/incendium/tags/items/tools_armor.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/worldgen/biome/structure/has_castle.json b/data/incendium/tags/worldgen/biome/structure/has_castle.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/worldgen/biome/structure/has_pipeline.json b/data/incendium/tags/worldgen/biome/structure/has_pipeline.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/worldgen/biome/structure/has_reactor.json b/data/incendium/tags/worldgen/biome/structure/has_reactor.json old mode 100755 new mode 100644 diff --git a/data/incendium/tags/worldgen/biome/structure/has_sanctum.json b/data/incendium/tags/worldgen/biome/structure/has_sanctum.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/biome/ash_barrens.json b/data/incendium/worldgen/biome/ash_barrens.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/biome/infernal_dunes.json b/data/incendium/worldgen/biome/infernal_dunes.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/biome/inverted_forest.json b/data/incendium/worldgen/biome/inverted_forest.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/biome/quartz_flats.json b/data/incendium/worldgen/biome/quartz_flats.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/biome/toxic_heap.json b/data/incendium/worldgen/biome/toxic_heap.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/biome/volcanic_deltas.json b/data/incendium/worldgen/biome/volcanic_deltas.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/biome/weeping_valley.json b/data/incendium/worldgen/biome/weeping_valley.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/biome/withered_forest.json b/data/incendium/worldgen/biome/withered_forest.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_carver/big_cave.json b/data/incendium/worldgen/configured_carver/big_cave.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/ash_barrens/ash_delta.json b/data/incendium/worldgen/configured_feature/ash_barrens/ash_delta.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/ash_barrens/ash_replace.json b/data/incendium/worldgen/configured_feature/ash_barrens/ash_replace.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/ash_barrens/ash_vegetation.json b/data/incendium/worldgen/configured_feature/ash_barrens/ash_vegetation.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/ash_barrens/basalt_ceiling.json b/data/incendium/worldgen/configured_feature/ash_barrens/basalt_ceiling.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/ash_barrens/crimson_patch_large.json b/data/incendium/worldgen/configured_feature/ash_barrens/crimson_patch_large.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/ash_barrens/crimson_patch_small.json b/data/incendium/worldgen/configured_feature/ash_barrens/crimson_patch_small.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/ash_barrens/smooth_basalt.json b/data/incendium/worldgen/configured_feature/ash_barrens/smooth_basalt.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/ash_barrens/tree.json b/data/incendium/worldgen/configured_feature/ash_barrens/tree.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/ash_barrens/tree_bend.json b/data/incendium/worldgen/configured_feature/ash_barrens/tree_bend.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/ash_barrens/tree_big.json b/data/incendium/worldgen/configured_feature/ash_barrens/tree_big.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/ash_barrens/vines_ceiling.json b/data/incendium/worldgen/configured_feature/ash_barrens/vines_ceiling.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/ash_barrens/vines_ceiling_dx.json b/data/incendium/worldgen/configured_feature/ash_barrens/vines_ceiling_dx.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/crimson_jungle/tree_log_base.json b/data/incendium/worldgen/configured_feature/crimson_jungle/tree_log_base.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/feature_pool/clear_basalt.json b/data/incendium/worldgen/configured_feature/feature_pool/clear_basalt.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/feature_pool/crimson_stem_pile.json b/data/incendium/worldgen/configured_feature/feature_pool/crimson_stem_pile.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/feature_pool/crimson_vegetation.json b/data/incendium/worldgen/configured_feature/feature_pool/crimson_vegetation.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/feature_pool/gold_pile.json b/data/incendium/worldgen/configured_feature/feature_pool/gold_pile.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/feature_pool/quartz_pile.json b/data/incendium/worldgen/configured_feature/feature_pool/quartz_pile.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/feature_pool/stripped_crimson_stem_pile.json b/data/incendium/worldgen/configured_feature/feature_pool/stripped_crimson_stem_pile.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/feature_pool/stripped_warped_stem_pile.json b/data/incendium/worldgen/configured_feature/feature_pool/stripped_warped_stem_pile.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/feature_pool/twisting_vines.json b/data/incendium/worldgen/configured_feature/feature_pool/twisting_vines.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/feature_pool/warped_fungus.json b/data/incendium/worldgen/configured_feature/feature_pool/warped_fungus.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/feature_pool/warped_stem_pile.json b/data/incendium/worldgen/configured_feature/feature_pool/warped_stem_pile.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/feature_pool/warped_vegetation.json b/data/incendium/worldgen/configured_feature/feature_pool/warped_vegetation.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/nether_wastes/spike_block.json b/data/incendium/worldgen/configured_feature/nether_wastes/spike_block.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/quartz_flats/quartz_crystal.json b/data/incendium/worldgen/configured_feature/quartz_flats/quartz_crystal.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/quartz_flats/quartz_delta.json b/data/incendium/worldgen/configured_feature/quartz_flats/quartz_delta.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/configured_feature/quartz_flats/quartz_replace.json b/data/incendium/worldgen/configured_feature/quartz_flats/quartz_replace.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/climate/continentalness.json b/data/incendium/worldgen/density_function/climate/continentalness.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/climate/depth.json b/data/incendium/worldgen/density_function/climate/depth.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/climate/erosion.json b/data/incendium/worldgen/density_function/climate/erosion.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/climate/factor.json b/data/incendium/worldgen/density_function/climate/factor.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/climate/humidity.json b/data/incendium/worldgen/density_function/climate/humidity.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/climate/purity.json b/data/incendium/worldgen/density_function/climate/purity.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/climate/temperature.json b/data/incendium/worldgen/density_function/climate/temperature.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/climate/weirdness.json b/data/incendium/worldgen/density_function/climate/weirdness.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/final_density.json b/data/incendium/worldgen/density_function/final_density.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/huge_tunnel.json b/data/incendium/worldgen/density_function/huge_tunnel.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/math/pillars.json b/data/incendium/worldgen/density_function/math/pillars.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/math/sloped_cheese.json b/data/incendium/worldgen/density_function/math/sloped_cheese.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/swiss_cheese.json b/data/incendium/worldgen/density_function/swiss_cheese.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/tunnels.json b/data/incendium/worldgen/density_function/tunnels.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/web1.json b/data/incendium/worldgen/density_function/web1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/density_function/web2.json b/data/incendium/worldgen/density_function/web2.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/barrens/ceiling.json b/data/incendium/worldgen/noise/barrens/ceiling.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/barrens/cracks.json b/data/incendium/worldgen/noise/barrens/cracks.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/climate/continentalness.json b/data/incendium/worldgen/noise/climate/continentalness.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/climate/erosion.json b/data/incendium/worldgen/noise/climate/erosion.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/climate/humidity.json b/data/incendium/worldgen/noise/climate/humidity.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/climate/purity.json b/data/incendium/worldgen/noise/climate/purity.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/climate/temperature.json b/data/incendium/worldgen/noise/climate/temperature.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/climate/weirdness.json b/data/incendium/worldgen/noise/climate/weirdness.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/dunes/strip.json b/data/incendium/worldgen/noise/dunes/strip.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/inverted/ceiling.json b/data/incendium/worldgen/noise/inverted/ceiling.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/inverted/floor.json b/data/incendium/worldgen/noise/inverted/floor.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/cave/cheese.json b/data/incendium/worldgen/noise/math/cave/cheese.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/cave/tunnel_a.json b/data/incendium/worldgen/noise/math/cave/tunnel_a.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/cave/tunnel_b.json b/data/incendium/worldgen/noise/math/cave/tunnel_b.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/cave/tunnel_thickness.json b/data/incendium/worldgen/noise/math/cave/tunnel_thickness.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/cave/tunnel_toggle.json b/data/incendium/worldgen/noise/math/cave/tunnel_toggle.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web/web1.json b/data/incendium/worldgen/noise/math/web/web1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web/web2.json b/data/incendium/worldgen/noise/math/web/web2.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web/web3.json b/data/incendium/worldgen/noise/math/web/web3.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web/web4.json b/data/incendium/worldgen/noise/math/web/web4.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web/web_set1.json b/data/incendium/worldgen/noise/math/web/web_set1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web/web_set2.json b/data/incendium/worldgen/noise/math/web/web_set2.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web/web_set3.json b/data/incendium/worldgen/noise/math/web/web_set3.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web/web_set4.json b/data/incendium/worldgen/noise/math/web/web_set4.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web2/web1.json b/data/incendium/worldgen/noise/math/web2/web1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web2/web2.json b/data/incendium/worldgen/noise/math/web2/web2.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web2/web3.json b/data/incendium/worldgen/noise/math/web2/web3.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web2/web4.json b/data/incendium/worldgen/noise/math/web2/web4.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web2/web_set1.json b/data/incendium/worldgen/noise/math/web2/web_set1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web2/web_set2.json b/data/incendium/worldgen/noise/math/web2/web_set2.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web2/web_set3.json b/data/incendium/worldgen/noise/math/web2/web_set3.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/math/web2/web_set4.json b/data/incendium/worldgen/noise/math/web2/web_set4.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/quartz/ceiling.json b/data/incendium/worldgen/noise/quartz/ceiling.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/quartz/cracks.json b/data/incendium/worldgen/noise/quartz/cracks.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/quartz/half.json b/data/incendium/worldgen/noise/quartz/half.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/tendril/noise.json b/data/incendium/worldgen/noise/tendril/noise.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/tendril/shift1.json b/data/incendium/worldgen/noise/tendril/shift1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/tendril/shift2.json b/data/incendium/worldgen/noise/tendril/shift2.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/toxic/blackstone.json b/data/incendium/worldgen/noise/toxic/blackstone.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/toxic/ceiling.json b/data/incendium/worldgen/noise/toxic/ceiling.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/toxic/ceiling_blackstone.json b/data/incendium/worldgen/noise/toxic/ceiling_blackstone.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/toxic/ceiling_green.json b/data/incendium/worldgen/noise/toxic/ceiling_green.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/toxic/green.json b/data/incendium/worldgen/noise/toxic/green.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/toxic/surface.json b/data/incendium/worldgen/noise/toxic/surface.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/volcanic/magma.json b/data/incendium/worldgen/noise/volcanic/magma.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/withered/magma_ceiling.json b/data/incendium/worldgen/noise/withered/magma_ceiling.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/withered/magma_region.json b/data/incendium/worldgen/noise/withered/magma_region.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/withered/magma_strip.json b/data/incendium/worldgen/noise/withered/magma_strip.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/withered/netherrack.json b/data/incendium/worldgen/noise/withered/netherrack.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/noise/withered/strip.json b/data/incendium/worldgen/noise/withered/strip.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/ash_barrens/ash_delta.json b/data/incendium/worldgen/placed_feature/ash_barrens/ash_delta.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/ash_barrens/ash_replace.json b/data/incendium/worldgen/placed_feature/ash_barrens/ash_replace.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/ash_barrens/ash_vegetation.json b/data/incendium/worldgen/placed_feature/ash_barrens/ash_vegetation.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/ash_barrens/basalt_ceiling.json b/data/incendium/worldgen/placed_feature/ash_barrens/basalt_ceiling.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/ash_barrens/crimson_patch_large.json b/data/incendium/worldgen/placed_feature/ash_barrens/crimson_patch_large.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/ash_barrens/crimson_patch_small.json b/data/incendium/worldgen/placed_feature/ash_barrens/crimson_patch_small.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/ash_barrens/smooth_basalt.json b/data/incendium/worldgen/placed_feature/ash_barrens/smooth_basalt.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/ash_barrens/tree.json b/data/incendium/worldgen/placed_feature/ash_barrens/tree.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/ash_barrens/tree_bend.json b/data/incendium/worldgen/placed_feature/ash_barrens/tree_bend.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/ash_barrens/tree_big.json b/data/incendium/worldgen/placed_feature/ash_barrens/tree_big.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/ash_barrens/vines_ceiling.json b/data/incendium/worldgen/placed_feature/ash_barrens/vines_ceiling.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/ash_barrens/vines_ceiling_dx.json b/data/incendium/worldgen/placed_feature/ash_barrens/vines_ceiling_dx.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/crimson_jungle/flower_tree.json b/data/incendium/worldgen/placed_feature/crimson_jungle/flower_tree.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/crimson_jungle/flower_tree_2.json b/data/incendium/worldgen/placed_feature/crimson_jungle/flower_tree_2.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/crimson_jungle/flower_tree_base.json b/data/incendium/worldgen/placed_feature/crimson_jungle/flower_tree_base.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/crimson_jungle/tree_log.json b/data/incendium/worldgen/placed_feature/crimson_jungle/tree_log.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/crimson_jungle/trees_up_outer.json b/data/incendium/worldgen/placed_feature/crimson_jungle/trees_up_outer.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/crimson_jungle/trees_vines.json b/data/incendium/worldgen/placed_feature/crimson_jungle/trees_vines.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/feature_pool/clear_basalt.json b/data/incendium/worldgen/placed_feature/feature_pool/clear_basalt.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/feature_pool/crimson_stem_pile.json b/data/incendium/worldgen/placed_feature/feature_pool/crimson_stem_pile.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/feature_pool/crimson_vegetation.json b/data/incendium/worldgen/placed_feature/feature_pool/crimson_vegetation.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/feature_pool/gold_pile.json b/data/incendium/worldgen/placed_feature/feature_pool/gold_pile.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/feature_pool/quartz_pile.json b/data/incendium/worldgen/placed_feature/feature_pool/quartz_pile.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/feature_pool/stripped_crimson_stem_pile.json b/data/incendium/worldgen/placed_feature/feature_pool/stripped_crimson_stem_pile.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/feature_pool/stripped_warped_stem_pile.json b/data/incendium/worldgen/placed_feature/feature_pool/stripped_warped_stem_pile.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/feature_pool/twisting_vines.json b/data/incendium/worldgen/placed_feature/feature_pool/twisting_vines.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/feature_pool/warped_fungus.json b/data/incendium/worldgen/placed_feature/feature_pool/warped_fungus.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/feature_pool/warped_stem_pile.json b/data/incendium/worldgen/placed_feature/feature_pool/warped_stem_pile.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/feature_pool/warped_vegetation.json b/data/incendium/worldgen/placed_feature/feature_pool/warped_vegetation.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/infernal_dunes/blood_vines.json b/data/incendium/worldgen/placed_feature/infernal_dunes/blood_vines.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/infernal_dunes/blood_vines_long.json b/data/incendium/worldgen/placed_feature/infernal_dunes/blood_vines_long.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/infernal_dunes/bush.json b/data/incendium/worldgen/placed_feature/infernal_dunes/bush.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/infernal_dunes/delta.json b/data/incendium/worldgen/placed_feature/infernal_dunes/delta.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/infernal_dunes/dune.json b/data/incendium/worldgen/placed_feature/infernal_dunes/dune.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/inverted_forest/trees_extra.json b/data/incendium/worldgen/placed_feature/inverted_forest/trees_extra.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/inverted_forest/trees_step1.json b/data/incendium/worldgen/placed_feature/inverted_forest/trees_step1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/inverted_forest/trees_step2.json b/data/incendium/worldgen/placed_feature/inverted_forest/trees_step2.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/inverted_forest/trees_step2_big.json b/data/incendium/worldgen/placed_feature/inverted_forest/trees_step2_big.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/inverted_forest/trees_up_inner.json b/data/incendium/worldgen/placed_feature/inverted_forest/trees_up_inner.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/inverted_forest/trees_up_outer.json b/data/incendium/worldgen/placed_feature/inverted_forest/trees_up_outer.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/inverted_forest/trees_vines.json b/data/incendium/worldgen/placed_feature/inverted_forest/trees_vines.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/nether_wastes/glowstone_extend.json b/data/incendium/worldgen/placed_feature/nether_wastes/glowstone_extend.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/nether_wastes/glowstone_px.json b/data/incendium/worldgen/placed_feature/nether_wastes/glowstone_px.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/nether_wastes/spike.json b/data/incendium/worldgen/placed_feature/nether_wastes/spike.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/nether_wastes/spike_old.json b/data/incendium/worldgen/placed_feature/nether_wastes/spike_old.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/nether_wastes/spike_old1.json b/data/incendium/worldgen/placed_feature/nether_wastes/spike_old1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/nether_wastes/spike_small.json b/data/incendium/worldgen/placed_feature/nether_wastes/spike_small.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/nothing.json b/data/incendium/worldgen/placed_feature/nothing.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/nuclear_pit/single_spike.json b/data/incendium/worldgen/placed_feature/nuclear_pit/single_spike.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/quartz_flats/odd_fossil.json b/data/incendium/worldgen/placed_feature/quartz_flats/odd_fossil.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/quartz_flats/quartz_crystal.json b/data/incendium/worldgen/placed_feature/quartz_flats/quartz_crystal.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/quartz_flats/quartz_delta.json b/data/incendium/worldgen/placed_feature/quartz_flats/quartz_delta.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/quartz_flats/quartz_replace.json b/data/incendium/worldgen/placed_feature/quartz_flats/quartz_replace.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/quartz_flats/soul_fire_rings.json b/data/incendium/worldgen/placed_feature/quartz_flats/soul_fire_rings.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/test_crimson_fungus.json b/data/incendium/worldgen/placed_feature/test_crimson_fungus.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/test_fossil.json b/data/incendium/worldgen/placed_feature/test_fossil.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/toxic_heap/junk_pile.json b/data/incendium/worldgen/placed_feature/toxic_heap/junk_pile.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/toxic_heap/lava_flows.json b/data/incendium/worldgen/placed_feature/toxic_heap/lava_flows.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/toxic_heap/spike.json b/data/incendium/worldgen/placed_feature/toxic_heap/spike.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/volcanic_deltas/delta.json b/data/incendium/worldgen/placed_feature/volcanic_deltas/delta.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/volcanic_deltas/eruption.json b/data/incendium/worldgen/placed_feature/volcanic_deltas/eruption.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/weeping_valley/ceiling.json b/data/incendium/worldgen/placed_feature/weeping_valley/ceiling.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/weeping_valley/surface.json b/data/incendium/worldgen/placed_feature/weeping_valley/surface.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/weeping_valley/tendril1_ceiling.json b/data/incendium/worldgen/placed_feature/weeping_valley/tendril1_ceiling.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/weeping_valley/tendril1_floor.json b/data/incendium/worldgen/placed_feature/weeping_valley/tendril1_floor.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/weeping_valley/tendril2_ceiling.json b/data/incendium/worldgen/placed_feature/weeping_valley/tendril2_ceiling.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/weeping_valley/tendril2_floor.json b/data/incendium/worldgen/placed_feature/weeping_valley/tendril2_floor.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/withered_forest/tree1.json b/data/incendium/worldgen/placed_feature/withered_forest/tree1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/placed_feature/withered_forest/trees.json b/data/incendium/worldgen/placed_feature/withered_forest/trees.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/arena.json b/data/incendium/worldgen/processor_list/arena.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/blaze_castle.json b/data/incendium/worldgen/processor_list/blaze_castle.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/acacia.json b/data/incendium/worldgen/processor_list/castle/acacia.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/alcove1.json b/data/incendium/worldgen/processor_list/castle/alcove1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/armory.json b/data/incendium/worldgen/processor_list/castle/armory.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/birch.json b/data/incendium/worldgen/processor_list/castle/birch.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/bridge_decay.json b/data/incendium/worldgen/processor_list/castle/bridge_decay.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/clock.json b/data/incendium/worldgen/processor_list/castle/clock.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/coolant.json b/data/incendium/worldgen/processor_list/castle/coolant.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/corridor1.json b/data/incendium/worldgen/processor_list/castle/corridor1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/dark_oak.json b/data/incendium/worldgen/processor_list/castle/dark_oak.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/dining.json b/data/incendium/worldgen/processor_list/castle/dining.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/grow_nether_wart.json b/data/incendium/worldgen/processor_list/castle/grow_nether_wart.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/jungle.json b/data/incendium/worldgen/processor_list/castle/jungle.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/lumber.json b/data/incendium/worldgen/processor_list/castle/lumber.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/netherite.json b/data/incendium/worldgen/processor_list/castle/netherite.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/oak.json b/data/incendium/worldgen/processor_list/castle/oak.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/ocean_portal.json b/data/incendium/worldgen/processor_list/castle/ocean_portal.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/pyro.json b/data/incendium/worldgen/processor_list/castle/pyro.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/spruce.json b/data/incendium/worldgen/processor_list/castle/spruce.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/table1_1.json b/data/incendium/worldgen/processor_list/castle/table1_1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/table2_1.json b/data/incendium/worldgen/processor_list/castle/table2_1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/table2_2.json b/data/incendium/worldgen/processor_list/castle/table2_2.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/table_small.json b/data/incendium/worldgen/processor_list/castle/table_small.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle/trap.json b/data/incendium/worldgen/processor_list/castle/trap.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle_floor.json b/data/incendium/worldgen/processor_list/castle_floor.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/castle_tower.json b/data/incendium/worldgen/processor_list/castle_tower.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/church.json b/data/incendium/worldgen/processor_list/church.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/corruption.json b/data/incendium/worldgen/processor_list/corruption.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/cvill_road.json b/data/incendium/worldgen/processor_list/cvill_road.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/destroy_half.json b/data/incendium/worldgen/processor_list/destroy_half.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/heavy_damage.json b/data/incendium/worldgen/processor_list/heavy_damage.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/lab.json b/data/incendium/worldgen/processor_list/lab.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/light_damage.json b/data/incendium/worldgen/processor_list/light_damage.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/maybe_soul.json b/data/incendium/worldgen/processor_list/maybe_soul.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/nuclear_option.json b/data/incendium/worldgen/processor_list/nuclear_option.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/nuclear_option_courtyard.json b/data/incendium/worldgen/processor_list/nuclear_option_courtyard.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/nuclear_option_mid.json b/data/incendium/worldgen/processor_list/nuclear_option_mid.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/nuclear_option_tower.json b/data/incendium/worldgen/processor_list/nuclear_option_tower.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/nuclear_option_wall.json b/data/incendium/worldgen/processor_list/nuclear_option_wall.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/phantom_nest.json b/data/incendium/worldgen/processor_list/phantom_nest.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/pipe_large.json b/data/incendium/worldgen/processor_list/pipe_large.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/pipe_large_heap.json b/data/incendium/worldgen/processor_list/pipe_large_heap.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/pipe_small.json b/data/incendium/worldgen/processor_list/pipe_small.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/pipe_small_heap.json b/data/incendium/worldgen/processor_list/pipe_small_heap.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/reactor.json b/data/incendium/worldgen/processor_list/reactor.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/remedy.json b/data/incendium/worldgen/processor_list/remedy.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/stilt.json b/data/incendium/worldgen/processor_list/stilt.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/void.json b/data/incendium/worldgen/processor_list/void.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/wither_arena.json b/data/incendium/worldgen/processor_list/wither_arena.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/processor_list/za_warudo_stand.json b/data/incendium/worldgen/processor_list/za_warudo_stand.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/structure/abandoned_tower.json b/data/incendium/worldgen/structure/abandoned_tower.json index a45d129..1b6fdc6 100644 --- a/data/incendium/worldgen/structure/abandoned_tower.json +++ b/data/incendium/worldgen/structure/abandoned_tower.json @@ -7,7 +7,7 @@ "type": "minecraft:jigsaw", "start_pool": "incendium:quartz/tower", "size": 6, - "step": "surface_structures", + "step": "underground_decoration", "start_height": { "absolute": 33 }, diff --git a/data/incendium/worldgen/structure/forbidden_castle.json b/data/incendium/worldgen/structure/forbidden_castle.json index 8af7d5a..54236c5 100644 --- a/data/incendium/worldgen/structure/forbidden_castle.json +++ b/data/incendium/worldgen/structure/forbidden_castle.json @@ -10,7 +10,7 @@ "type": "minecraft:jigsaw", "start_pool": "incendium:castle", "size": 7, - "step": "surface_structures", + "step": "underground_decoration", "start_height": { "absolute": 33 }, diff --git a/data/incendium/worldgen/structure/infernal_altar.json b/data/incendium/worldgen/structure/infernal_altar.json index 7cae3ec..32ec4d3 100644 --- a/data/incendium/worldgen/structure/infernal_altar.json +++ b/data/incendium/worldgen/structure/infernal_altar.json @@ -4,7 +4,7 @@ "type": "minecraft:jigsaw", "start_pool": "incendium:purified_arena", "size": 6, - "step": "surface_structures", + "step": "underground_decoration", "terrain_adaptation": "beard_thin", "start_height": { "absolute": 33 diff --git a/data/incendium/worldgen/structure/nether_reactor.json b/data/incendium/worldgen/structure/nether_reactor.json index ce9f669..212e554 100644 --- a/data/incendium/worldgen/structure/nether_reactor.json +++ b/data/incendium/worldgen/structure/nether_reactor.json @@ -9,7 +9,7 @@ "type": "minecraft:jigsaw", "start_pool": "incendium:toxic/reactor", "size": 6, - "step": "surface_structures", + "step": "underground_decoration", "terrain_adaptation": "beard_thin", "start_height": { "absolute": 33 diff --git a/data/incendium/worldgen/structure/piglin_village.json b/data/incendium/worldgen/structure/piglin_village.json index b0ef790..38d4793 100644 --- a/data/incendium/worldgen/structure/piglin_village.json +++ b/data/incendium/worldgen/structure/piglin_village.json @@ -7,7 +7,7 @@ "type": "minecraft:jigsaw", "start_pool": "incendium:cvill/town_centers", "size": 6, - "step": "surface_structures", + "step": "underground_decoration", "terrain_adaptation": "beard_thin", "start_height": { "absolute": 33 diff --git a/data/incendium/worldgen/structure/pipeline.json b/data/incendium/worldgen/structure/pipeline.json index 8153b89..f5debc4 100644 --- a/data/incendium/worldgen/structure/pipeline.json +++ b/data/incendium/worldgen/structure/pipeline.json @@ -3,9 +3,9 @@ "adapt_noise": false, "spawn_overrides": {}, "type": "minecraft:jigsaw", - "start_pool": "incendium:steam/starts", + "start_pool": "incendium:pipes/pipe_start", "size": 7, - "step": "surface_structures", + "step": "underground_decoration", "start_height": { "absolute": 33 }, diff --git a/data/incendium/worldgen/structure/quartz_kitchen.json b/data/incendium/worldgen/structure/quartz_kitchen.json index d4adcc4..46f6d1f 100644 --- a/data/incendium/worldgen/structure/quartz_kitchen.json +++ b/data/incendium/worldgen/structure/quartz_kitchen.json @@ -7,7 +7,7 @@ "type": "minecraft:jigsaw", "start_pool": "incendium:quartz/kitchen", "size": 6, - "step": "surface_structures", + "step": "underground_decoration", "start_height": { "absolute": 33 }, diff --git a/data/incendium/worldgen/structure/ruined_lab.json b/data/incendium/worldgen/structure/ruined_lab.json index ef6b585..49d95cc 100644 --- a/data/incendium/worldgen/structure/ruined_lab.json +++ b/data/incendium/worldgen/structure/ruined_lab.json @@ -4,7 +4,7 @@ "type": "minecraft:jigsaw", "start_pool": "incendium:scorched/starts", "size": 6, - "step": "surface_structures", + "step": "underground_decoration", "terrain_adaptation": "beard_thin", "start_height": { "absolute": 33 diff --git a/data/incendium/worldgen/structure/sanctum.json b/data/incendium/worldgen/structure/sanctum.json index d825400..d3e01f4 100644 --- a/data/incendium/worldgen/structure/sanctum.json +++ b/data/incendium/worldgen/structure/sanctum.json @@ -16,7 +16,7 @@ "type": "minecraft:jigsaw", "start_pool": "incendium:quartz/sanctum", "size": 6, - "step": "surface_structures", + "step": "underground_decoration", "start_height": { "absolute": 33 }, diff --git a/data/incendium/worldgen/structure_set/greater_structures.json b/data/incendium/worldgen/structure_set/greater_structures.json old mode 100755 new mode 100644 index 3c77a31..943102b --- a/data/incendium/worldgen/structure_set/greater_structures.json +++ b/data/incendium/worldgen/structure_set/greater_structures.json @@ -10,7 +10,7 @@ }, { "structure": "incendium:nether_reactor", - "weight": 5 + "weight": 3 } ], "placement": { @@ -20,4 +20,3 @@ "type": "minecraft:random_spread" } } - diff --git a/data/incendium/worldgen/structure_set/lesser_structures.json b/data/incendium/worldgen/structure_set/lesser_structures.json old mode 100755 new mode 100644 index 5a3e8eb..a85a4de --- a/data/incendium/worldgen/structure_set/lesser_structures.json +++ b/data/incendium/worldgen/structure_set/lesser_structures.json @@ -2,27 +2,27 @@ "structures": [ { "structure": "incendium:quartz_kitchen", - "weight": 1 + "weight": 2 }, { "structure": "incendium:abandoned_tower", - "weight": 1 + "weight": 3 }, { "structure": "incendium:pipeline", - "weight": 1 + "weight": 2 }, { "structure": "incendium:piglin_village", - "weight": 1 + "weight": 2 }, { "structure": "incendium:infernal_altar", - "weight": 1 + "weight": 2 }, { "structure": "incendium:ruined_lab", - "weight": 1 + "weight": 4 } ], "placement": { @@ -30,10 +30,9 @@ "salt": 399125, "exclusion_zone": { "other_set": "incendium:greater_structures", - "chunk_count": 16 + "chunk_count": 8 }, - "spacing": 24, + "spacing": 20, "separation": 12 } } - diff --git a/data/incendium/worldgen/template_pool/anarchy/large_casts.json b/data/incendium/worldgen/template_pool/anarchy/large_casts.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/anarchy/large_force.json b/data/incendium/worldgen/template_pool/anarchy/large_force.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/anarchy/starts.json b/data/incendium/worldgen/template_pool/anarchy/starts.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle.json b/data/incendium/worldgen/template_pool/castle.json old mode 100755 new mode 100644 index 5c16385..11cae42 --- a/data/incendium/worldgen/template_pool/castle.json +++ b/data/incendium/worldgen/template_pool/castle.json @@ -5,7 +5,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/1x1_l1", + "location": "incendium:castle/floors/1x1_l1", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/archer.json b/data/incendium/worldgen/template_pool/castle/archer.json old mode 100755 new mode 100644 index 39e5bbb..9235d13 --- a/data/incendium/worldgen/template_pool/castle/archer.json +++ b/data/incendium/worldgen/template_pool/castle/archer.json @@ -14,7 +14,8 @@ { "weight": 2, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/archer_always.json b/data/incendium/worldgen/template_pool/castle/archer_always.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/bridges.json b/data/incendium/worldgen/template_pool/castle/bridges.json old mode 100755 new mode 100644 index 843ed50..e55ea07 --- a/data/incendium/worldgen/template_pool/castle/bridges.json +++ b/data/incendium/worldgen/template_pool/castle/bridges.json @@ -14,7 +14,8 @@ { "weight": 10, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/bridges_broken.json b/data/incendium/worldgen/template_pool/castle/bridges_broken.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/corridor/alcoves.json b/data/incendium/worldgen/template_pool/castle/corridor/alcoves.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/corridor/alcoves_small.json b/data/incendium/worldgen/template_pool/castle/corridor/alcoves_small.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/corridor/corridors.json b/data/incendium/worldgen/template_pool/castle/corridor/corridors.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/courtyards.json b/data/incendium/worldgen/template_pool/castle/courtyards.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/courtyards_p2.json b/data/incendium/worldgen/template_pool/castle/courtyards_p2.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/brewing/cages.json b/data/incendium/worldgen/template_pool/castle/decor/brewing/cages.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/brewing/cages_w.json b/data/incendium/worldgen/template_pool/castle/decor/brewing/cages_w.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/brewing/farms.json b/data/incendium/worldgen/template_pool/castle/decor/brewing/farms.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/brewing/farms_small.json b/data/incendium/worldgen/template_pool/castle/decor/brewing/farms_small.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/brewing/farms_small_w.json b/data/incendium/worldgen/template_pool/castle/decor/brewing/farms_small_w.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/brewing/farms_w.json b/data/incendium/worldgen/template_pool/castle/decor/brewing/farms_w.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/brewing/stands.json b/data/incendium/worldgen/template_pool/castle/decor/brewing/stands.json old mode 100755 new mode 100644 index 6ca5a44..502202c --- a/data/incendium/worldgen/template_pool/castle/decor/brewing/stands.json +++ b/data/incendium/worldgen/template_pool/castle/decor/brewing/stands.json @@ -59,7 +59,8 @@ { "weight": 7, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/decor/ceiling_lights.json b/data/incendium/worldgen/template_pool/castle/decor/ceiling_lights.json old mode 100755 new mode 100644 index 4228d5d..2caa54f --- a/data/incendium/worldgen/template_pool/castle/decor/ceiling_lights.json +++ b/data/incendium/worldgen/template_pool/castle/decor/ceiling_lights.json @@ -59,7 +59,8 @@ { "weight": 10, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/decor/ceiling_lights_some_soul.json b/data/incendium/worldgen/template_pool/castle/decor/ceiling_lights_some_soul.json old mode 100755 new mode 100644 index 1b758df..1cb072f --- a/data/incendium/worldgen/template_pool/castle/decor/ceiling_lights_some_soul.json +++ b/data/incendium/worldgen/template_pool/castle/decor/ceiling_lights_some_soul.json @@ -59,7 +59,8 @@ { "weight": 10, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/decor/crossroads_decor.json b/data/incendium/worldgen/template_pool/castle/decor/crossroads_decor.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/farms.json b/data/incendium/worldgen/template_pool/castle/decor/farms.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/farms_warped.json b/data/incendium/worldgen/template_pool/castle/decor/farms_warped.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/lumber_c.json b/data/incendium/worldgen/template_pool/castle/decor/lumber_c.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/lumber_w.json b/data/incendium/worldgen/template_pool/castle/decor/lumber_w.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/saplings.json b/data/incendium/worldgen/template_pool/castle/decor/saplings.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/saplings_b.json b/data/incendium/worldgen/template_pool/castle/decor/saplings_b.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/saplings_small.json b/data/incendium/worldgen/template_pool/castle/decor/saplings_small.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/statues_quartz.json b/data/incendium/worldgen/template_pool/castle/decor/statues_quartz.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/storage_random.json b/data/incendium/worldgen/template_pool/castle/decor/storage_random.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/tables.json b/data/incendium/worldgen/template_pool/castle/decor/tables.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/decor/tables_small.json b/data/incendium/worldgen/template_pool/castle/decor/tables_small.json old mode 100755 new mode 100644 index 9e6bee3..3117909 --- a/data/incendium/worldgen/template_pool/castle/decor/tables_small.json +++ b/data/incendium/worldgen/template_pool/castle/decor/tables_small.json @@ -32,7 +32,8 @@ { "weight": 5, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/decor/treasure/bomb.json b/data/incendium/worldgen/template_pool/castle/decor/treasure/bomb.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/feature_pool/clear_basalt.json b/data/incendium/worldgen/template_pool/castle/feature_pool/clear_basalt.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/feature_pool/crimson_vegetation.json b/data/incendium/worldgen/template_pool/castle/feature_pool/crimson_vegetation.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/feature_pool/gold_pile.json b/data/incendium/worldgen/template_pool/castle/feature_pool/gold_pile.json old mode 100755 new mode 100644 index 98e2de9..11a3658 --- a/data/incendium/worldgen/template_pool/castle/feature_pool/gold_pile.json +++ b/data/incendium/worldgen/template_pool/castle/feature_pool/gold_pile.json @@ -13,7 +13,8 @@ { "weight": 3, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/feature_pool/quartz_pile.json b/data/incendium/worldgen/template_pool/castle/feature_pool/quartz_pile.json old mode 100755 new mode 100644 index f4285e8..1a3540a --- a/data/incendium/worldgen/template_pool/castle/feature_pool/quartz_pile.json +++ b/data/incendium/worldgen/template_pool/castle/feature_pool/quartz_pile.json @@ -13,7 +13,8 @@ { "weight": 3, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/feature_pool/warped_fungus.json b/data/incendium/worldgen/template_pool/castle/feature_pool/warped_fungus.json old mode 100755 new mode 100644 index 42375bb..2f8b8ee --- a/data/incendium/worldgen/template_pool/castle/feature_pool/warped_fungus.json +++ b/data/incendium/worldgen/template_pool/castle/feature_pool/warped_fungus.json @@ -13,7 +13,8 @@ { "weight": 4, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/feature_pool/warped_stem_pile.json b/data/incendium/worldgen/template_pool/castle/feature_pool/warped_stem_pile.json old mode 100755 new mode 100644 index a85e8d1..99dca64 --- a/data/incendium/worldgen/template_pool/castle/feature_pool/warped_stem_pile.json +++ b/data/incendium/worldgen/template_pool/castle/feature_pool/warped_stem_pile.json @@ -21,7 +21,8 @@ { "weight": 13, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/feature_pool/warped_vegetation.json b/data/incendium/worldgen/template_pool/castle/feature_pool/warped_vegetation.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/feature_pool/warped_vegetation_max.json b/data/incendium/worldgen/template_pool/castle/feature_pool/warped_vegetation_max.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/floor_l1.json b/data/incendium/worldgen/template_pool/castle/floor_l1.json old mode 100755 new mode 100644 index a27a442..24f0e59 --- a/data/incendium/worldgen/template_pool/castle/floor_l1.json +++ b/data/incendium/worldgen/template_pool/castle/floor_l1.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/1x1_l1", + "location": "incendium:castle/floors/1x1_l1", "processors": "incendium:nuclear_option_mid", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/floor_l2.json b/data/incendium/worldgen/template_pool/castle/floor_l2.json old mode 100755 new mode 100644 index ccd3052..894079b --- a/data/incendium/worldgen/template_pool/castle/floor_l2.json +++ b/data/incendium/worldgen/template_pool/castle/floor_l2.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/1x1_l2", + "location": "incendium:castle/floors/1x1_l2", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 4, "element": { - "location": "incendium:castle/2x1_l2", + "location": "incendium:castle/floors/2x1_l2", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 4, "element": { - "location": "incendium:castle/2x2_l2", + "location": "incendium:castle/floors/2x2_l2", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/floor_l2_forced.json b/data/incendium/worldgen/template_pool/castle/floor_l2_forced.json old mode 100755 new mode 100644 index cbcaaa6..32617e6 --- a/data/incendium/worldgen/template_pool/castle/floor_l2_forced.json +++ b/data/incendium/worldgen/template_pool/castle/floor_l2_forced.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/courtyard_2x1", + "location": "incendium:castle/courtyards/courtyard_2x1", "processors": "incendium:nuclear_option_courtyard", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/floor_l3.json b/data/incendium/worldgen/template_pool/castle/floor_l3.json old mode 100755 new mode 100644 index b532221..4997d6f --- a/data/incendium/worldgen/template_pool/castle/floor_l3.json +++ b/data/incendium/worldgen/template_pool/castle/floor_l3.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/1x1_l3", + "location": "incendium:castle/floors/1x1_l3", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 4, "element": { - "location": "incendium:castle/2x1_l3", + "location": "incendium:castle/floors/2x1_l3", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 6, "element": { - "location": "incendium:castle/2x2_l3", + "location": "incendium:castle/floors/2x2_l3", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/floor_l3_forced.json b/data/incendium/worldgen/template_pool/castle/floor_l3_forced.json old mode 100755 new mode 100644 index 704987c..38be2a1 --- a/data/incendium/worldgen/template_pool/castle/floor_l3_forced.json +++ b/data/incendium/worldgen/template_pool/castle/floor_l3_forced.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/courtyard_1x1", + "location": "incendium:castle/courtyards/courtyard_1x1", "processors": "incendium:nuclear_option_courtyard", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/floor_l3_h.json b/data/incendium/worldgen/template_pool/castle/floor_l3_h.json old mode 100755 new mode 100644 index ac488d9..7f73e59 --- a/data/incendium/worldgen/template_pool/castle/floor_l3_h.json +++ b/data/incendium/worldgen/template_pool/castle/floor_l3_h.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/1x1_l3", + "location": "incendium:castle/floors/1x1_l3", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 3, "element": { - "location": "incendium:castle/2x1_l3", + "location": "incendium:castle/floors/2x1_l3", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 3, "element": { - "location": "incendium:castle/2x2_l3", + "location": "incendium:castle/floors/2x2_l3", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -32,7 +32,7 @@ { "weight": 6, "element": { - "location": "incendium:castle/2x2_l3_alt", + "location": "incendium:castle/floors/2x2_l3_alt", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/garden_2x1.json b/data/incendium/worldgen/template_pool/castle/garden_2x1.json old mode 100755 new mode 100644 index e19c282..2c94bd4 --- a/data/incendium/worldgen/template_pool/castle/garden_2x1.json +++ b/data/incendium/worldgen/template_pool/castle/garden_2x1.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/garden_2x1", + "location": "incendium:castle/courtyards/garden_2x1", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/house_1x1.json b/data/incendium/worldgen/template_pool/castle/house_1x1.json old mode 100755 new mode 100644 index 2aa84a0..0f1f3e8 --- a/data/incendium/worldgen/template_pool/castle/house_1x1.json +++ b/data/incendium/worldgen/template_pool/castle/house_1x1.json @@ -149,7 +149,7 @@ { "weight": 4, "element": { - "location": "incendium:castle/roof_1x1_3", + "location": "incendium:castle/roofs/roof_1x1_3", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -158,7 +158,7 @@ { "weight": 7, "element": { - "location": "incendium:castle/roof_1x1_5", + "location": "incendium:castle/roofs/roof_1x1_5", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -167,7 +167,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/roof_1x1_6", + "location": "incendium:castle/roofs/roof_1x1_6", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -176,7 +176,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/roof_1x1_short1", + "location": "incendium:castle/roofs/roof_1x1_short1", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -185,7 +185,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/roof_1x1_short1_hoglin", + "location": "incendium:castle/roofs/roof_1x1_short1_hoglin", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -194,7 +194,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/roof_1x1_short2", + "location": "incendium:castle/roofs/roof_1x1_short2", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/house_1x1_base.json b/data/incendium/worldgen/template_pool/castle/house_1x1_base.json old mode 100755 new mode 100644 index 63ace15..1f917f0 --- a/data/incendium/worldgen/template_pool/castle/house_1x1_base.json +++ b/data/incendium/worldgen/template_pool/castle/house_1x1_base.json @@ -50,7 +50,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/tower_small", + "location": "incendium:castle/tower/tower_small", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -59,7 +59,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/tower_small_w", + "location": "incendium:castle/tower/tower_small_w", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/house_1x1_corner.json b/data/incendium/worldgen/template_pool/castle/house_1x1_corner.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/house_1x1_ladder.json b/data/incendium/worldgen/template_pool/castle/house_1x1_ladder.json old mode 100755 new mode 100644 index e781a87..3e29e25 --- a/data/incendium/worldgen/template_pool/castle/house_1x1_ladder.json +++ b/data/incendium/worldgen/template_pool/castle/house_1x1_ladder.json @@ -5,7 +5,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/roof_1x1_4", + "location": "incendium:castle/roofs/roof_1x1_4", "processors": "minecraft:empty", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/roof_1x1_8", + "location": "incendium:castle/roofs/roof_1x1_8", "processors": "minecraft:empty", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/house_2x1.json b/data/incendium/worldgen/template_pool/castle/house_2x1.json old mode 100755 new mode 100644 index fac5e41..07d510f --- a/data/incendium/worldgen/template_pool/castle/house_2x1.json +++ b/data/incendium/worldgen/template_pool/castle/house_2x1.json @@ -59,7 +59,7 @@ { "weight": 4, "element": { - "location": "incendium:castle/roof_2x1_1", + "location": "incendium:castle/roofs/roof_2x1_1", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -68,7 +68,7 @@ { "weight": 3, "element": { - "location": "incendium:castle/roof_2x1_2", + "location": "incendium:castle/roofs/roof_2x1_2", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -77,7 +77,7 @@ { "weight": 3, "element": { - "location": "incendium:castle/roof_2x1_3", + "location": "incendium:castle/roofs/roof_2x1_3", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -86,7 +86,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/roof_2x1_4", + "location": "incendium:castle/roofs/roof_2x1_4", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/house_2x1_base.json b/data/incendium/worldgen/template_pool/castle/house_2x1_base.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/house_2x2_base.json b/data/incendium/worldgen/template_pool/castle/house_2x2_base.json old mode 100755 new mode 100644 index 1e03b63..f654405 --- a/data/incendium/worldgen/template_pool/castle/house_2x2_base.json +++ b/data/incendium/worldgen/template_pool/castle/house_2x2_base.json @@ -59,7 +59,8 @@ { "weight": 9, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/knight.json b/data/incendium/worldgen/template_pool/castle/knight.json old mode 100755 new mode 100644 index 8ddd966..f4bedb0 --- a/data/incendium/worldgen/template_pool/castle/knight.json +++ b/data/incendium/worldgen/template_pool/castle/knight.json @@ -14,7 +14,8 @@ { "weight": 2, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/knight_diamond.json b/data/incendium/worldgen/template_pool/castle/knight_diamond.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/knight_netherite.json b/data/incendium/worldgen/template_pool/castle/knight_netherite.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/knight_random.json b/data/incendium/worldgen/template_pool/castle/knight_random.json old mode 100755 new mode 100644 index 5b03c2d..5324ae0 --- a/data/incendium/worldgen/template_pool/castle/knight_random.json +++ b/data/incendium/worldgen/template_pool/castle/knight_random.json @@ -41,7 +41,8 @@ { "weight": 16, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/loot/lumber.json b/data/incendium/worldgen/template_pool/castle/loot/lumber.json old mode 100755 new mode 100644 index 5fd5569..5572dc5 --- a/data/incendium/worldgen/template_pool/castle/loot/lumber.json +++ b/data/incendium/worldgen/template_pool/castle/loot/lumber.json @@ -59,7 +59,8 @@ { "weight": 5, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/main_tower.json b/data/incendium/worldgen/template_pool/castle/main_tower.json old mode 100755 new mode 100644 index bce352e..c4ab654 --- a/data/incendium/worldgen/template_pool/castle/main_tower.json +++ b/data/incendium/worldgen/template_pool/castle/main_tower.json @@ -5,7 +5,7 @@ { "weight": 10, "element": { - "location": "incendium:castle/tower_main", + "location": "incendium:castle/tower/tower_main", "processors": "incendium:nuclear_option_mid", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/marker.json b/data/incendium/worldgen/template_pool/castle/marker.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/mobs/alchemist.json b/data/incendium/worldgen/template_pool/castle/mobs/alchemist.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/mobs/blacksmith.json b/data/incendium/worldgen/template_pool/castle/mobs/blacksmith.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/mobs/knight_guard.json b/data/incendium/worldgen/template_pool/castle/mobs/knight_guard.json old mode 100755 new mode 100644 index 1e1ba1c..fde6adc --- a/data/incendium/worldgen/template_pool/castle/mobs/knight_guard.json +++ b/data/incendium/worldgen/template_pool/castle/mobs/knight_guard.json @@ -14,7 +14,8 @@ { "weight": 2, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/mobs/paratrooper.json b/data/incendium/worldgen/template_pool/castle/mobs/paratrooper.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/mobs/pyro.json b/data/incendium/worldgen/template_pool/castle/mobs/pyro.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/mobs/scout.json b/data/incendium/worldgen/template_pool/castle/mobs/scout.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/old/floor_l0.json b/data/incendium/worldgen/template_pool/castle/old/floor_l0.json old mode 100755 new mode 100644 index cc304f0..4d0698e --- a/data/incendium/worldgen/template_pool/castle/old/floor_l0.json +++ b/data/incendium/worldgen/template_pool/castle/old/floor_l0.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/1x1_l1", + "location": "incendium:castle/floors/1x1_l1", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 3, "element": { - "location": "incendium:castle/2x1_l1", + "location": "incendium:castle/floors/2x1_l1", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/2x2_l1", + "location": "incendium:castle/floors/2x2_l1", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/old/floor_l1.json b/data/incendium/worldgen/template_pool/castle/old/floor_l1.json old mode 100755 new mode 100644 index 6717382..b749460 --- a/data/incendium/worldgen/template_pool/castle/old/floor_l1.json +++ b/data/incendium/worldgen/template_pool/castle/old/floor_l1.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/1x1_l2", + "location": "incendium:castle/floors/1x1_l2", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 3, "element": { - "location": "incendium:castle/2x1_l2", + "location": "incendium:castle/floors/2x1_l2", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/2x2_l2", + "location": "incendium:castle/floors/2x2_l2", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/old/floor_l2.json b/data/incendium/worldgen/template_pool/castle/old/floor_l2.json old mode 100755 new mode 100644 index c16c4f5..835bfae --- a/data/incendium/worldgen/template_pool/castle/old/floor_l2.json +++ b/data/incendium/worldgen/template_pool/castle/old/floor_l2.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/1x1_l3", + "location": "incendium:castle/floors/1x1_l3", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 3, "element": { - "location": "incendium:castle/2x1_l3", + "location": "incendium:castle/floors/2x1_l3", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/2x2_l3", + "location": "incendium:castle/floors/2x2_l3", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/old/floor_l3.json b/data/incendium/worldgen/template_pool/castle/old/floor_l3.json old mode 100755 new mode 100644 index 6efd082..51984d2 --- a/data/incendium/worldgen/template_pool/castle/old/floor_l3.json +++ b/data/incendium/worldgen/template_pool/castle/old/floor_l3.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/1x1_l4", + "location": "incendium:castle/floors/1x1_l4", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 3, "element": { - "location": "incendium:castle/2x1_l4", + "location": "incendium:castle/floors/2x1_l4", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/2x2_l4", + "location": "incendium:castle/floors/2x2_l4", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/old/house_1x1.json b/data/incendium/worldgen/template_pool/castle/old/house_1x1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/old/house_2x1.json b/data/incendium/worldgen/template_pool/castle/old/house_2x1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/old/house_2x2.json b/data/incendium/worldgen/template_pool/castle/old/house_2x2.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/old/starter.json b/data/incendium/worldgen/template_pool/castle/old/starter.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/old/towers.json b/data/incendium/worldgen/template_pool/castle/old/towers.json old mode 100755 new mode 100644 index bc1cd94..7dc7af7 --- a/data/incendium/worldgen/template_pool/castle/old/towers.json +++ b/data/incendium/worldgen/template_pool/castle/old/towers.json @@ -5,7 +5,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/tower_simple1", + "location": "incendium:castle/tower/tower_simple1", "processors": "incendium:castle_tower", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/old/towersw.json b/data/incendium/worldgen/template_pool/castle/old/towersw.json old mode 100755 new mode 100644 index bc1cd94..7dc7af7 --- a/data/incendium/worldgen/template_pool/castle/old/towersw.json +++ b/data/incendium/worldgen/template_pool/castle/old/towersw.json @@ -5,7 +5,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/tower_simple1", + "location": "incendium:castle/tower/tower_simple1", "processors": "incendium:castle_tower", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/old/walls.json b/data/incendium/worldgen/template_pool/castle/old/walls.json old mode 100755 new mode 100644 index 93ed633..6a852df --- a/data/incendium/worldgen/template_pool/castle/old/walls.json +++ b/data/incendium/worldgen/template_pool/castle/old/walls.json @@ -5,7 +5,7 @@ { "weight": 150, "element": { - "location": "incendium:castle/wall_simple1", + "location": "incendium:castle/walls/wall_simple1", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 150, "element": { - "location": "incendium:castle/wall_simple1", + "location": "incendium:castle/walls/wall_simple1", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 150, "element": { - "location": "incendium:castle/wall_simple1", + "location": "incendium:castle/walls/wall_simple1", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -32,7 +32,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/wall_simple1_fb", + "location": "incendium:castle/walls/wall_simple1_fb", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/remedy.json b/data/incendium/worldgen/template_pool/castle/remedy.json old mode 100755 new mode 100644 index f2dbe5c..f5df3ca --- a/data/incendium/worldgen/template_pool/castle/remedy.json +++ b/data/incendium/worldgen/template_pool/castle/remedy.json @@ -5,7 +5,8 @@ { "weight": 1, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/roof_1x1.json b/data/incendium/worldgen/template_pool/castle/roof_1x1.json old mode 100755 new mode 100644 index cd1ed65..cd35f9d --- a/data/incendium/worldgen/template_pool/castle/roof_1x1.json +++ b/data/incendium/worldgen/template_pool/castle/roof_1x1.json @@ -5,7 +5,7 @@ { "weight": 12, "element": { - "location": "incendium:castle/roof_1x1_1", + "location": "incendium:castle/roofs/roof_1x1_1", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 12, "element": { - "location": "incendium:castle/roof_1x1_2", + "location": "incendium:castle/roofs/roof_1x1_2", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 3, "element": { - "location": "incendium:castle/roof_1x1_3", + "location": "incendium:castle/roofs/roof_1x1_3", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -32,7 +32,7 @@ { "weight": 6, "element": { - "location": "incendium:castle/roof_1x1_4", + "location": "incendium:castle/roofs/roof_1x1_4", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -41,7 +41,7 @@ { "weight": 4, "element": { - "location": "incendium:castle/roof_1x1_8", + "location": "incendium:castle/roofs/roof_1x1_8", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -68,7 +68,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/roof_1x1_6", + "location": "incendium:castle/roofs/roof_1x1_6", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -77,7 +77,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/roof_1x1_short1", + "location": "incendium:castle/roofs/roof_1x1_short1", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/roof_1x1_ladder.json b/data/incendium/worldgen/template_pool/castle/roof_1x1_ladder.json old mode 100755 new mode 100644 index 35eec07..c406e29 --- a/data/incendium/worldgen/template_pool/castle/roof_1x1_ladder.json +++ b/data/incendium/worldgen/template_pool/castle/roof_1x1_ladder.json @@ -5,7 +5,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/roof_1x1_4", + "location": "incendium:castle/roofs/roof_1x1_4", "processors": "minecraft:empty", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/roof_1x1_8", + "location": "incendium:castle/roofs/roof_1x1_8", "processors": "minecraft:empty", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/roof_1x1_old.json b/data/incendium/worldgen/template_pool/castle/roof_1x1_old.json old mode 100755 new mode 100644 index eb5b0f3..bc199e7 --- a/data/incendium/worldgen/template_pool/castle/roof_1x1_old.json +++ b/data/incendium/worldgen/template_pool/castle/roof_1x1_old.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/roof_1x1_1", + "location": "incendium:castle/roofs/roof_1x1_1", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/roof_1x1_2", + "location": "incendium:castle/roofs/roof_1x1_2", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/roof_1x1_3", + "location": "incendium:castle/roofs/roof_1x1_3", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -32,7 +32,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/roof_1x1_4", + "location": "incendium:castle/roofs/roof_1x1_4", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -41,7 +41,7 @@ { "weight": 4, "element": { - "location": "incendium:castle/roof_1x1_5", + "location": "incendium:castle/roofs/roof_1x1_5", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -50,7 +50,7 @@ { "weight": 4, "element": { - "location": "incendium:castle/roof_1x1_6", + "location": "incendium:castle/roofs/roof_1x1_6", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -59,7 +59,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/roof_1x1_short1", + "location": "incendium:castle/roofs/roof_1x1_short1", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -68,7 +68,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/roof_1x1_short2", + "location": "incendium:castle/roofs/roof_1x1_short2", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/roof_1x1_short.json b/data/incendium/worldgen/template_pool/castle/roof_1x1_short.json old mode 100755 new mode 100644 index 69985e6..b9f665c --- a/data/incendium/worldgen/template_pool/castle/roof_1x1_short.json +++ b/data/incendium/worldgen/template_pool/castle/roof_1x1_short.json @@ -5,7 +5,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/roof_1x1_short1", + "location": "incendium:castle/roofs/roof_1x1_short1", "processors": "incendium:nuclear_option", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/roof_1x1_short2", + "location": "incendium:castle/roofs/roof_1x1_short2", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/roof_2x1.json b/data/incendium/worldgen/template_pool/castle/roof_2x1.json old mode 100755 new mode 100644 index 40167f5..d697f8f --- a/data/incendium/worldgen/template_pool/castle/roof_2x1.json +++ b/data/incendium/worldgen/template_pool/castle/roof_2x1.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/roof_2x1_1", + "location": "incendium:castle/roofs/roof_2x1_1", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/roof_2x1_2", + "location": "incendium:castle/roofs/roof_2x1_2", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 3, "element": { - "location": "incendium:castle/roof_2x1_3", + "location": "incendium:castle/roofs/roof_2x1_3", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/roof_2x1_farm.json b/data/incendium/worldgen/template_pool/castle/roof_2x1_farm.json old mode 100755 new mode 100644 index 94040de..05a3dfe --- a/data/incendium/worldgen/template_pool/castle/roof_2x1_farm.json +++ b/data/incendium/worldgen/template_pool/castle/roof_2x1_farm.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/roof_2x1_special_farm", + "location": "incendium:castle/roofs/roof_2x1_special_farm", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/roof_2x1_farm_warped.json b/data/incendium/worldgen/template_pool/castle/roof_2x1_farm_warped.json old mode 100755 new mode 100644 index cddf695..02082ba --- a/data/incendium/worldgen/template_pool/castle/roof_2x1_farm_warped.json +++ b/data/incendium/worldgen/template_pool/castle/roof_2x1_farm_warped.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/roof_2x1_special_farm_warped", + "location": "incendium:castle/roofs/roof_2x1_special_farm_warped", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/small_statues.json b/data/incendium/worldgen/template_pool/castle/small_statues.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/small_walls.json b/data/incendium/worldgen/template_pool/castle/small_walls.json old mode 100755 new mode 100644 index 71dff61..1203785 --- a/data/incendium/worldgen/template_pool/castle/small_walls.json +++ b/data/incendium/worldgen/template_pool/castle/small_walls.json @@ -5,7 +5,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/wall_10", + "location": "incendium:castle/walls/wall_10", "processors": "incendium:nuclear_option_wall", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/staircase_aligner.json b/data/incendium/worldgen/template_pool/castle/staircase_aligner.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/statue_forced.json b/data/incendium/worldgen/template_pool/castle/statue_forced.json old mode 100755 new mode 100644 index 6c591de..89bc27c --- a/data/incendium/worldgen/template_pool/castle/statue_forced.json +++ b/data/incendium/worldgen/template_pool/castle/statue_forced.json @@ -5,7 +5,7 @@ { "weight": 50, "element": { - "location": "incendium:castle/statue_2x2", + "location": "incendium:castle/statues/statue_2x2", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/strider/pools.json b/data/incendium/worldgen/template_pool/castle/strider/pools.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/tests/columns.json b/data/incendium/worldgen/template_pool/castle/tests/columns.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/tests/crimson_stem_pile.json b/data/incendium/worldgen/template_pool/castle/tests/crimson_stem_pile.json old mode 100755 new mode 100644 index 4b4ee5a..7dccd8e --- a/data/incendium/worldgen/template_pool/castle/tests/crimson_stem_pile.json +++ b/data/incendium/worldgen/template_pool/castle/tests/crimson_stem_pile.json @@ -21,7 +21,8 @@ { "weight": 13, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/tests/fossil.json b/data/incendium/worldgen/template_pool/castle/tests/fossil.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/tests/fungus.json b/data/incendium/worldgen/template_pool/castle/tests/fungus.json old mode 100755 new mode 100644 index 4dd715d..f6f5a5e --- a/data/incendium/worldgen/template_pool/castle/tests/fungus.json +++ b/data/incendium/worldgen/template_pool/castle/tests/fungus.json @@ -13,7 +13,8 @@ { "weight": 4, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } } ] diff --git a/data/incendium/worldgen/template_pool/castle/tests/spike.json b/data/incendium/worldgen/template_pool/castle/tests/spike.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/tests/vines_t.json b/data/incendium/worldgen/template_pool/castle/tests/vines_t.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/tower_base.json b/data/incendium/worldgen/template_pool/castle/tower_base.json old mode 100755 new mode 100644 index 1e9c43c..f755975 --- a/data/incendium/worldgen/template_pool/castle/tower_base.json +++ b/data/incendium/worldgen/template_pool/castle/tower_base.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/tower_base", + "location": "incendium:castle/tower/tower_base", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/tower_decor.json b/data/incendium/worldgen/template_pool/castle/tower_decor.json old mode 100755 new mode 100644 index 48d442e..a1bdec8 --- a/data/incendium/worldgen/template_pool/castle/tower_decor.json +++ b/data/incendium/worldgen/template_pool/castle/tower_decor.json @@ -5,13 +5,14 @@ { "weight": 70, "element": { - "element_type": "minecraft:empty_pool_element" + "element_type": "minecraft:empty_pool_element", + "projection": "rigid" } }, { "weight": 1, "element": { - "location": "incendium:castle/wall/decor1", + "location": "incendium:castle/wall_decor/decor1", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -20,7 +21,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/wall/decor2", + "location": "incendium:castle/wall_decor/decor2", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -29,7 +30,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/wall/decor3", + "location": "incendium:castle/wall_decor/decor3", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -38,7 +39,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/wall/decor4", + "location": "incendium:castle/wall_decor/decor4", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -47,7 +48,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/wall/decor6", + "location": "incendium:castle/wall_decor/decor6", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/tower_floor_base.json b/data/incendium/worldgen/template_pool/castle/tower_floor_base.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/castle/tower_main_top.json b/data/incendium/worldgen/template_pool/castle/tower_main_top.json old mode 100755 new mode 100644 index 8b17969..56d2bc7 --- a/data/incendium/worldgen/template_pool/castle/tower_main_top.json +++ b/data/incendium/worldgen/template_pool/castle/tower_main_top.json @@ -5,7 +5,7 @@ { "weight": 10, "element": { - "location": "incendium:castle/tower_main_top", + "location": "incendium:castle/tower/tower_main_top", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/towers.json b/data/incendium/worldgen/template_pool/castle/towers.json old mode 100755 new mode 100644 index d6c0c31..967bc35 --- a/data/incendium/worldgen/template_pool/castle/towers.json +++ b/data/incendium/worldgen/template_pool/castle/towers.json @@ -5,7 +5,7 @@ { "weight": 10, "element": { - "location": "incendium:castle/tower_d1", + "location": "incendium:castle/tower/tower_d1", "processors": "incendium:nuclear_option_wall", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/tower_d2", + "location": "incendium:castle/tower/tower_d2", "processors": "incendium:nuclear_option_wall", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 1, "element": { - "location": "incendium:castle/tower_backup", + "location": "incendium:castle/tower/tower_backup", "processors": "incendium:nuclear_option_wall", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/walls.json b/data/incendium/worldgen/template_pool/castle/walls.json old mode 100755 new mode 100644 index f560486..6f2f881 --- a/data/incendium/worldgen/template_pool/castle/walls.json +++ b/data/incendium/worldgen/template_pool/castle/walls.json @@ -5,7 +5,7 @@ { "weight": 10, "element": { - "location": "incendium:castle/wall_15_compat", + "location": "incendium:castle/walls/wall_15_compat", "processors": "incendium:nuclear_option_wall", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 5, "element": { - "location": "incendium:castle/wall_15", + "location": "incendium:castle/walls/wall_15", "processors": "incendium:nuclear_option_wall", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 3, "element": { - "location": "incendium:castle/wall_15w", + "location": "incendium:castle/walls/wall_15w", "processors": "incendium:nuclear_option_wall", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -32,7 +32,7 @@ { "weight": 3, "element": { - "location": "incendium:castle/wall_corner", + "location": "incendium:castle/walls/wall_corner", "processors": "incendium:nuclear_option_wall", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle/walls_gate.json b/data/incendium/worldgen/template_pool/castle/walls_gate.json old mode 100755 new mode 100644 index 04a4a6d..29de3e7 --- a/data/incendium/worldgen/template_pool/castle/walls_gate.json +++ b/data/incendium/worldgen/template_pool/castle/walls_gate.json @@ -5,7 +5,7 @@ { "weight": 3, "element": { - "location": "incendium:castle/wall_gate", + "location": "incendium:castle/walls/wall_gate", "processors": "incendium:nuclear_option_wall", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 2, "element": { - "location": "incendium:castle/wall_gate3", + "location": "incendium:castle/walls/wall_gate3", "processors": "incendium:nuclear_option_wall", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/castle_or_pipeline.json b/data/incendium/worldgen/template_pool/castle_or_pipeline.json old mode 100755 new mode 100644 index 7be4082..251acdd --- a/data/incendium/worldgen/template_pool/castle_or_pipeline.json +++ b/data/incendium/worldgen/template_pool/castle_or_pipeline.json @@ -5,7 +5,7 @@ { "weight": 2, "element": { - "location": "incendium:steam/start1", + "location": "incendium:pipeline/start1", "processors": "incendium:pipe_large", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/church/extensions.json b/data/incendium/worldgen/template_pool/church/extensions.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/church/glass.json b/data/incendium/worldgen/template_pool/church/glass.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/cvill/anti_generic.json b/data/incendium/worldgen/template_pool/cvill/anti_generic.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/cvill/generic.json b/data/incendium/worldgen/template_pool/cvill/generic.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/cvill/piglin_workers.json b/data/incendium/worldgen/template_pool/cvill/piglin_workers.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/cvill/piglins.json b/data/incendium/worldgen/template_pool/cvill/piglins.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/cvill/roads.json b/data/incendium/worldgen/template_pool/cvill/roads.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/cvill/stilts.json b/data/incendium/worldgen/template_pool/cvill/stilts.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/cvill/town_centers.json b/data/incendium/worldgen/template_pool/cvill/town_centers.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/dunes/spire.json b/data/incendium/worldgen/template_pool/dunes/spire.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/dunes/starts.json b/data/incendium/worldgen/template_pool/dunes/starts.json old mode 100755 new mode 100644 index 1f35b47..0118281 --- a/data/incendium/worldgen/template_pool/dunes/starts.json +++ b/data/incendium/worldgen/template_pool/dunes/starts.json @@ -5,20 +5,11 @@ { "weight": 1, "element": { - "location": "incendium:steam/start1", + "location": "incendium:pipeline/start1", "processors": "incendium:pipe_large", "projection": "rigid", "element_type": "minecraft:single_pool_element" } - }, - { - "weight": 1, - "element": { - "location": "incendium:blazecastle_1", - "processors": "incendium:blaze_castle", - "projection": "rigid", - "element_type": "minecraft:single_pool_element" - } } ] } diff --git a/data/incendium/worldgen/template_pool/generic.json b/data/incendium/worldgen/template_pool/generic.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/generic_extra_village.json b/data/incendium/worldgen/template_pool/generic_extra_village.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/generic_no_nest.json b/data/incendium/worldgen/template_pool/generic_no_nest.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/generic_no_village.json b/data/incendium/worldgen/template_pool/generic_no_village.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/pipes/pipe_first.json b/data/incendium/worldgen/template_pool/pipes/pipe_first.json old mode 100755 new mode 100644 index f128f35..a51f493 --- a/data/incendium/worldgen/template_pool/pipes/pipe_first.json +++ b/data/incendium/worldgen/template_pool/pipes/pipe_first.json @@ -5,7 +5,7 @@ { "weight": 1, "element": { - "location": "incendium:pipes/pipe_first_joint1", + "location": "incendium:pipeline/pipe_first_joint1", "processors": "minecraft:bastion_generic_degradation", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/pipes/pipe_start.json b/data/incendium/worldgen/template_pool/pipes/pipe_start.json old mode 100755 new mode 100644 index e3a2606..ceb51ea --- a/data/incendium/worldgen/template_pool/pipes/pipe_start.json +++ b/data/incendium/worldgen/template_pool/pipes/pipe_start.json @@ -5,7 +5,7 @@ { "weight": 1, "element": { - "location": "incendium:pipes/pipe_start", + "location": "incendium:pipeline/start1", "processors": "minecraft:bastion_generic_degradation", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/pipes/vertical_pipes.json b/data/incendium/worldgen/template_pool/pipes/vertical_pipes.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/purified_arena.json b/data/incendium/worldgen/template_pool/purified_arena.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/quartz/buildings.json b/data/incendium/worldgen/template_pool/quartz/buildings.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/quartz/decor_small.json b/data/incendium/worldgen/template_pool/quartz/decor_small.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/quartz/kitchen.json b/data/incendium/worldgen/template_pool/quartz/kitchen.json old mode 100755 new mode 100644 index e481dfb..02bd764 --- a/data/incendium/worldgen/template_pool/quartz/kitchen.json +++ b/data/incendium/worldgen/template_pool/quartz/kitchen.json @@ -5,7 +5,7 @@ { "weight": 2, "element": { - "location": "incendium:quartz_kitchen", + "location": "incendium:quartz_flats/quartz_kitchen", "processors": "minecraft:bastion_generic_degradation", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/quartz/roads.json b/data/incendium/worldgen/template_pool/quartz/roads.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/quartz/roads_no_bone.json b/data/incendium/worldgen/template_pool/quartz/roads_no_bone.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/quartz/sanctum.json b/data/incendium/worldgen/template_pool/quartz/sanctum.json old mode 100755 new mode 100644 index 92115f7..212788f --- a/data/incendium/worldgen/template_pool/quartz/sanctum.json +++ b/data/incendium/worldgen/template_pool/quartz/sanctum.json @@ -5,7 +5,7 @@ { "weight": 2, "element": { - "location": "incendium:sanctum", + "location": "incendium:quartz_flats/sanctum", "processors": "minecraft:empty", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/quartz/sanctum_part_2.json b/data/incendium/worldgen/template_pool/quartz/sanctum_part_2.json old mode 100755 new mode 100644 index 4488ed2..f981064 --- a/data/incendium/worldgen/template_pool/quartz/sanctum_part_2.json +++ b/data/incendium/worldgen/template_pool/quartz/sanctum_part_2.json @@ -5,7 +5,7 @@ { "weight": 2, "element": { - "location": "incendium:sanctum2", + "location": "incendium:quartz_flats/sanctum2", "processors": "minecraft:empty", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/quartz/tower.json b/data/incendium/worldgen/template_pool/quartz/tower.json old mode 100755 new mode 100644 index 185d7b4..f628e0f --- a/data/incendium/worldgen/template_pool/quartz/tower.json +++ b/data/incendium/worldgen/template_pool/quartz/tower.json @@ -5,7 +5,7 @@ { "weight": 14, "element": { - "location": "incendium:quartz_tower1", + "location": "incendium:quartz_flats/quartz_tower1", "processors": "minecraft:bastion_generic_degradation", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 5, "element": { - "location": "incendium:quartz_tower2", + "location": "incendium:quartz_flats/quartz_tower2", "processors": "minecraft:bastion_generic_degradation", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 1, "element": { - "location": "incendium:quartz_tower3", + "location": "incendium:quartz_flats/quartz_tower3", "processors": "minecraft:bastion_generic_degradation", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/reactor_bottom.json b/data/incendium/worldgen/template_pool/reactor/reactor_bottom.json old mode 100755 new mode 100644 similarity index 83% rename from data/incendium/worldgen/template_pool/reactor_bottom.json rename to data/incendium/worldgen/template_pool/reactor/reactor_bottom.json index 731012d..0d2c0d4 --- a/data/incendium/worldgen/template_pool/reactor_bottom.json +++ b/data/incendium/worldgen/template_pool/reactor/reactor_bottom.json @@ -5,7 +5,7 @@ { "weight": 3, "element": { - "location": "incendium:reactor_bottom", + "location": "incendium:reactor/reactor_bottom", "processors": "incendium:reactor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/reactor_east.json b/data/incendium/worldgen/template_pool/reactor/reactor_east.json old mode 100755 new mode 100644 similarity index 84% rename from data/incendium/worldgen/template_pool/reactor_east.json rename to data/incendium/worldgen/template_pool/reactor/reactor_east.json index 44fd992..9a32c42 --- a/data/incendium/worldgen/template_pool/reactor_east.json +++ b/data/incendium/worldgen/template_pool/reactor/reactor_east.json @@ -5,7 +5,7 @@ { "weight": 3, "element": { - "location": "incendium:reactor_east", + "location": "incendium:reactor/reactor_east", "processors": "incendium:reactor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/reactor_last.json b/data/incendium/worldgen/template_pool/reactor/reactor_last.json old mode 100755 new mode 100644 similarity index 84% rename from data/incendium/worldgen/template_pool/reactor_last.json rename to data/incendium/worldgen/template_pool/reactor/reactor_last.json index b47e735..67dcfc9 --- a/data/incendium/worldgen/template_pool/reactor_last.json +++ b/data/incendium/worldgen/template_pool/reactor/reactor_last.json @@ -5,7 +5,7 @@ { "weight": 3, "element": { - "location": "incendium:reactor_last", + "location": "incendium:reactor/reactor_last", "processors": "incendium:reactor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/reactor_only.json b/data/incendium/worldgen/template_pool/reactor/reactor_only.json old mode 100755 new mode 100644 similarity index 85% rename from data/incendium/worldgen/template_pool/reactor_only.json rename to data/incendium/worldgen/template_pool/reactor/reactor_only.json index 700d9bd..af48916 --- a/data/incendium/worldgen/template_pool/reactor_only.json +++ b/data/incendium/worldgen/template_pool/reactor/reactor_only.json @@ -5,7 +5,7 @@ { "weight": 3, "element": { - "location": "incendium:reactor", + "location": "incendium:reactor/reactor", "processors": "incendium:reactor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/reactor_south.json b/data/incendium/worldgen/template_pool/reactor/reactor_south.json old mode 100755 new mode 100644 similarity index 71% rename from data/incendium/worldgen/template_pool/reactor_south.json rename to data/incendium/worldgen/template_pool/reactor/reactor_south.json index 0e6598c..d350a59 --- a/data/incendium/worldgen/template_pool/reactor_south.json +++ b/data/incendium/worldgen/template_pool/reactor/reactor_south.json @@ -1,11 +1,11 @@ { - "name": "incendium:pipes/pipe_start", + "name": "incendium:reactor/reactor_south", "fallback": "minecraft:empty", "elements": [ { "weight": 3, "element": { - "location": "incendium:reactor_south", + "location": "incendium:reactor/reactor_south", "processors": "incendium:reactor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/reactor_top.json b/data/incendium/worldgen/template_pool/reactor/reactor_top.json old mode 100755 new mode 100644 similarity index 84% rename from data/incendium/worldgen/template_pool/reactor_top.json rename to data/incendium/worldgen/template_pool/reactor/reactor_top.json index cf1d58f..3e009b1 --- a/data/incendium/worldgen/template_pool/reactor_top.json +++ b/data/incendium/worldgen/template_pool/reactor/reactor_top.json @@ -5,7 +5,7 @@ { "weight": 3, "element": { - "location": "incendium:reactor_top1", + "location": "incendium:reactor/reactor_top1", "processors": "incendium:reactor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/scorched/starts.json b/data/incendium/worldgen/template_pool/scorched/starts.json old mode 100755 new mode 100644 index 491f7fb..b5c50b6 --- a/data/incendium/worldgen/template_pool/scorched/starts.json +++ b/data/incendium/worldgen/template_pool/scorched/starts.json @@ -5,7 +5,7 @@ { "weight": 2, "element": { - "location": "incendium:wither_cage", + "location": "incendium:the_lab", "processors": "incendium:lab", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/statue_forced.json b/data/incendium/worldgen/template_pool/statue_forced.json index 4de5b3a..530990d 100644 --- a/data/incendium/worldgen/template_pool/statue_forced.json +++ b/data/incendium/worldgen/template_pool/statue_forced.json @@ -5,7 +5,7 @@ { "weight": 50, "element": { - "location": "incendium:castle/statue_2x2", + "location": "incendium:castle/statues/statue_2x2", "processors": "incendium:castle_floor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/steam/first.json b/data/incendium/worldgen/template_pool/steam/first.json old mode 100755 new mode 100644 index a21c964..3f2cef1 --- a/data/incendium/worldgen/template_pool/steam/first.json +++ b/data/incendium/worldgen/template_pool/steam/first.json @@ -1,11 +1,11 @@ { - "name": "incendium:steam/first", + "name": "incendium:pipeline/first", "fallback": "minecraft:empty", "elements": [ { "weight": 1, "element": { - "location": "incendium:steam/starter1", + "location": "incendium:pipeline/starter1", "processors": "incendium:pipe_large", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 1, "element": { - "location": "incendium:steam/starter2", + "location": "incendium:pipeline/starter2", "processors": "incendium:pipe_large", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/steam/h_end.json b/data/incendium/worldgen/template_pool/steam/h_end.json old mode 100755 new mode 100644 index 25c36cc..fed3e53 --- a/data/incendium/worldgen/template_pool/steam/h_end.json +++ b/data/incendium/worldgen/template_pool/steam/h_end.json @@ -5,7 +5,7 @@ { "weight": 3, "element": { - "location": "incendium:steam/small_h_end", + "location": "incendium:pipeline/small_h_end", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/steam/large_h.json b/data/incendium/worldgen/template_pool/steam/large_h.json old mode 100755 new mode 100644 index 478e209..869dc6c --- a/data/incendium/worldgen/template_pool/steam/large_h.json +++ b/data/incendium/worldgen/template_pool/steam/large_h.json @@ -5,7 +5,7 @@ { "weight": 2, "element": { - "location": "incendium:steam/large_h", + "location": "incendium:pipeline/large_h", "processors": "incendium:pipe_large", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 3, "element": { - "location": "incendium:steam/large_hv", + "location": "incendium:pipeline/large_hv", "processors": "incendium:pipe_large", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 3, "element": { - "location": "incendium:steam/large_vh", + "location": "incendium:pipeline/large_vh", "processors": "incendium:pipe_large", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -32,7 +32,7 @@ { "weight": 4, "element": { - "location": "incendium:steam/starter1", + "location": "incendium:pipeline/starter1", "processors": "incendium:pipe_large", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -41,7 +41,7 @@ { "weight": 4, "element": { - "location": "incendium:steam/starter2", + "location": "incendium:pipeline/starter2", "processors": "incendium:pipe_large", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/steam/large_v.json b/data/incendium/worldgen/template_pool/steam/large_v.json old mode 100755 new mode 100644 index cee2d93..f873b5a --- a/data/incendium/worldgen/template_pool/steam/large_v.json +++ b/data/incendium/worldgen/template_pool/steam/large_v.json @@ -5,7 +5,7 @@ { "weight": 6, "element": { - "location": "incendium:pipe_small", + "location": "incendium:pipeline/large_v", "processors": "minecraft:bastion_generic_degradation", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 4, "element": { - "location": "incendium:steam/large_hv", + "location": "incendium:pipeline/large_hv", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 4, "element": { - "location": "incendium:steam/large_vh", + "location": "incendium:pipeline/large_vh", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/steam/small_h.json b/data/incendium/worldgen/template_pool/steam/small_h.json old mode 100755 new mode 100644 index 875962c..aba05c6 --- a/data/incendium/worldgen/template_pool/steam/small_h.json +++ b/data/incendium/worldgen/template_pool/steam/small_h.json @@ -5,7 +5,7 @@ { "weight": 3, "element": { - "location": "incendium:steam/small_h_s", + "location": "incendium:pipeline/small_h_s", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 3, "element": { - "location": "incendium:steam/small_h_elbow", + "location": "incendium:pipeline/small_h_elbow", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 6, "element": { - "location": "incendium:steam/small_hv", + "location": "incendium:pipeline/small_hv", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -32,7 +32,7 @@ { "weight": 8, "element": { - "location": "incendium:steam/small_h_long", + "location": "incendium:pipeline/small_h_long", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -41,7 +41,7 @@ { "weight": 3, "element": { - "location": "incendium:steam/small_vh", + "location": "incendium:pipeline/small_vh", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -50,7 +50,7 @@ { "weight": 5, "element": { - "location": "incendium:steam/small_h_t", + "location": "incendium:pipeline/small_h_t", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -59,7 +59,7 @@ { "weight": 5, "element": { - "location": "incendium:steam/small_4way", + "location": "incendium:pipeline/small_4way", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -68,7 +68,7 @@ { "weight": 7, "element": { - "location": "incendium:steam/small_t_hv", + "location": "incendium:pipeline/small_t_hv", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -77,7 +77,7 @@ { "weight": 7, "element": { - "location": "incendium:steam/small_t_vh", + "location": "incendium:pipeline/small_t_vh", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/steam/small_v.json b/data/incendium/worldgen/template_pool/steam/small_v.json old mode 100755 new mode 100644 index 6077f9f..783b55f --- a/data/incendium/worldgen/template_pool/steam/small_v.json +++ b/data/incendium/worldgen/template_pool/steam/small_v.json @@ -5,7 +5,7 @@ { "weight": 3, "element": { - "location": "incendium:steam/small_v", + "location": "incendium:pipeline/small_v", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 3, "element": { - "location": "incendium:steam/small_v_tall", + "location": "incendium:pipeline/small_v_tall", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -23,7 +23,7 @@ { "weight": 6, "element": { - "location": "incendium:steam/small_hv", + "location": "incendium:pipeline/small_hv", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -32,7 +32,7 @@ { "weight": 5, "element": { - "location": "incendium:steam/small_vh", + "location": "incendium:pipeline/small_vh", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -41,7 +41,7 @@ { "weight": 4, "element": { - "location": "incendium:steam/small_t_hv", + "location": "incendium:pipeline/small_t_hv", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -50,7 +50,7 @@ { "weight": 4, "element": { - "location": "incendium:steam/small_t_vh", + "location": "incendium:pipeline/small_t_vh", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/steam/starts.json b/data/incendium/worldgen/template_pool/steam/starts.json old mode 100755 new mode 100644 index 8e22dce..0118281 --- a/data/incendium/worldgen/template_pool/steam/starts.json +++ b/data/incendium/worldgen/template_pool/steam/starts.json @@ -5,20 +5,11 @@ { "weight": 1, "element": { - "location": "incendium:steam/start1", + "location": "incendium:pipeline/start1", "processors": "incendium:pipe_large", "projection": "rigid", "element_type": "minecraft:single_pool_element" } - }, - { - "weight": 1, - "element": { - "location": "incendium:steam/start1", - "processors": "incendium:pipe_large", - "projection": "rigid", - "element_type": "minecraft:empty_pool_element" - } } ] } diff --git a/data/incendium/worldgen/template_pool/steam/v_end.json b/data/incendium/worldgen/template_pool/steam/v_end.json old mode 100755 new mode 100644 index 32da0f6..c2902ea --- a/data/incendium/worldgen/template_pool/steam/v_end.json +++ b/data/incendium/worldgen/template_pool/steam/v_end.json @@ -5,7 +5,7 @@ { "weight": 3, "element": { - "location": "incendium:steam/small_v_end", + "location": "incendium:pipeline/small_v_end", "processors": "incendium:pipe_small", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/testing/castle/castle_piece.json b/data/incendium/worldgen/template_pool/testing/castle/castle_piece.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/testing/castle/castle_piece_no_wall.json b/data/incendium/worldgen/template_pool/testing/castle/castle_piece_no_wall.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/testing/castle/castle_wall.json b/data/incendium/worldgen/template_pool/testing/castle/castle_wall.json old mode 100755 new mode 100644 index 3eb2c18..cd0d760 --- a/data/incendium/worldgen/template_pool/testing/castle/castle_wall.json +++ b/data/incendium/worldgen/template_pool/testing/castle/castle_wall.json @@ -5,7 +5,7 @@ { "weight": 150, "element": { - "location": "incendium:testing/castle/wall_tower", + "location": "incendium:testing/castle/walls/wall_tower", "processors": "minecraft:empty", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 150, "element": { - "location": "incendium:testing/castle/wall_tower2", + "location": "incendium:testing/castle/walls/wall_tower2", "processors": "minecraft:empty", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/testing/castle/tower.json b/data/incendium/worldgen/template_pool/testing/castle/tower.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/testing/jigsaw_inner1.json b/data/incendium/worldgen/template_pool/testing/jigsaw_inner1.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/testing/jigsaw_inner2.json b/data/incendium/worldgen/template_pool/testing/jigsaw_inner2.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/testing/jigsaw_outer.json b/data/incendium/worldgen/template_pool/testing/jigsaw_outer.json old mode 100755 new mode 100644 index 3b18674..382b6fb --- a/data/incendium/worldgen/template_pool/testing/jigsaw_outer.json +++ b/data/incendium/worldgen/template_pool/testing/jigsaw_outer.json @@ -5,7 +5,7 @@ { "weight": 3, "element": { - "location": "incendium:reactor", + "location": "incendium:reactor/reactor", "processors": "minecraft:empty", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/toxic/reactor.json b/data/incendium/worldgen/template_pool/toxic/reactor.json old mode 100755 new mode 100644 index ef319ab..275e553 --- a/data/incendium/worldgen/template_pool/toxic/reactor.json +++ b/data/incendium/worldgen/template_pool/toxic/reactor.json @@ -5,7 +5,7 @@ { "weight": 5, "element": { - "location": "incendium:reactor", + "location": "incendium:reactor/reactor", "processors": "incendium:reactor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/toxic/starts.json b/data/incendium/worldgen/template_pool/toxic/starts.json old mode 100755 new mode 100644 index b72a307..0475ce0 --- a/data/incendium/worldgen/template_pool/toxic/starts.json +++ b/data/incendium/worldgen/template_pool/toxic/starts.json @@ -5,7 +5,7 @@ { "weight": 3, "element": { - "location": "incendium:steam/start1", + "location": "incendium:pipeline/start1", "processors": "incendium:pipe_large", "projection": "rigid", "element_type": "minecraft:single_pool_element" @@ -14,7 +14,7 @@ { "weight": 5, "element": { - "location": "incendium:reactor", + "location": "incendium:reactor/reactor", "processors": "incendium:reactor", "projection": "rigid", "element_type": "minecraft:single_pool_element" diff --git a/data/incendium/worldgen/template_pool/wfa/starts.json b/data/incendium/worldgen/template_pool/wfa/starts.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/wither/arena.json b/data/incendium/worldgen/template_pool/wither/arena.json old mode 100755 new mode 100644 diff --git a/data/incendium/worldgen/template_pool/wither/corruption.json b/data/incendium/worldgen/template_pool/wither/corruption.json old mode 100755 new mode 100644 diff --git a/data/minecraft/dimension/the_nether.json b/data/minecraft/dimension/the_nether.json old mode 100755 new mode 100644 diff --git a/data/minecraft/loot_tables/blocks/acacia_log.json b/data/minecraft/loot_tables/blocks/acacia_log.json old mode 100755 new mode 100644 diff --git a/data/minecraft/loot_tables/blocks/birch_log.json b/data/minecraft/loot_tables/blocks/birch_log.json old mode 100755 new mode 100644 diff --git a/data/minecraft/loot_tables/blocks/dark_oak_log.json b/data/minecraft/loot_tables/blocks/dark_oak_log.json old mode 100755 new mode 100644 diff --git a/data/minecraft/loot_tables/blocks/jungle_log.json b/data/minecraft/loot_tables/blocks/jungle_log.json old mode 100755 new mode 100644 diff --git a/data/minecraft/loot_tables/blocks/oak_log.json b/data/minecraft/loot_tables/blocks/oak_log.json old mode 100755 new mode 100644 diff --git a/data/minecraft/loot_tables/blocks/spruce_log.json b/data/minecraft/loot_tables/blocks/spruce_log.json old mode 100755 new mode 100644 diff --git a/data/minecraft/loot_tables/entities/ghast.json b/data/minecraft/loot_tables/entities/ghast.json old mode 100755 new mode 100644 diff --git a/data/minecraft/loot_tables/entities/silverfish.json b/data/minecraft/loot_tables/entities/silverfish.json old mode 100755 new mode 100644 diff --git a/data/minecraft/loot_tables/entities/wither.json b/data/minecraft/loot_tables/entities/wither.json old mode 100755 new mode 100644 diff --git a/data/minecraft/recipes/comparator.json b/data/minecraft/recipes/comparator.json old mode 100755 new mode 100644 diff --git a/data/minecraft/recipes/dispenser.json b/data/minecraft/recipes/dispenser.json old mode 100755 new mode 100644 diff --git a/data/minecraft/recipes/dropper.json b/data/minecraft/recipes/dropper.json old mode 100755 new mode 100644 diff --git a/data/minecraft/recipes/lever.json b/data/minecraft/recipes/lever.json old mode 100755 new mode 100644 diff --git a/data/minecraft/recipes/observer.json b/data/minecraft/recipes/observer.json old mode 100755 new mode 100644 diff --git a/data/minecraft/recipes/piston.json b/data/minecraft/recipes/piston.json old mode 100755 new mode 100644 diff --git a/data/minecraft/recipes/repeater.json b/data/minecraft/recipes/repeater.json old mode 100755 new mode 100644 diff --git a/data/minecraft/tags/blocks/base_stone_nether.json b/data/minecraft/tags/blocks/base_stone_nether.json old mode 100755 new mode 100644 diff --git a/data/minecraft/tags/blocks/base_stone_overworld.json b/data/minecraft/tags/blocks/base_stone_overworld.json old mode 100755 new mode 100644 diff --git a/data/minecraft/tags/blocks/infiniburn_nether.json b/data/minecraft/tags/blocks/infiniburn_nether.json old mode 100755 new mode 100644 diff --git a/data/minecraft/tags/blocks/mushroom_grow_block.json b/data/minecraft/tags/blocks/mushroom_grow_block.json old mode 100755 new mode 100644 diff --git a/data/minecraft/tags/blocks/piglin_repellents.json b/data/minecraft/tags/blocks/piglin_repellents.json old mode 100755 new mode 100644 diff --git a/data/minecraft/tags/blocks/soul_fire_base_blocks.json b/data/minecraft/tags/blocks/soul_fire_base_blocks.json old mode 100755 new mode 100644 diff --git a/data/minecraft/tags/worldgen/biome/has_structure/bastion_remnant.json b/data/minecraft/tags/worldgen/biome/has_structure/bastion_remnant.json old mode 100755 new mode 100644 diff --git a/data/minecraft/tags/worldgen/biome/has_structure/nether_fortress.json b/data/minecraft/tags/worldgen/biome/has_structure/nether_fortress.json old mode 100755 new mode 100644 diff --git a/data/minecraft/tags/worldgen/biome/has_structure/nether_fossil.json b/data/minecraft/tags/worldgen/biome/has_structure/nether_fossil.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/biome/basalt_deltas.json b/data/minecraft/worldgen/biome/basalt_deltas.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/biome/crimson_forest.json b/data/minecraft/worldgen/biome/crimson_forest.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/biome/nether_wastes.json b/data/minecraft/worldgen/biome/nether_wastes.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/biome/soul_sand_valley.json b/data/minecraft/worldgen/biome/soul_sand_valley.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/biome/warped_forest.json b/data/minecraft/worldgen/biome/warped_forest.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_carver/nether_cave.json b/data/minecraft/worldgen/configured_carver/nether_cave.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/basalt_blobs.json b/data/minecraft/worldgen/configured_feature/basalt_blobs.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/basalt_pillar_base.json b/data/minecraft/worldgen/configured_feature/basalt_pillar_base.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/blackstone_blobs.json b/data/minecraft/worldgen/configured_feature/blackstone_blobs.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/brown_mushroom_nether.json b/data/minecraft/worldgen/configured_feature/brown_mushroom_nether.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/brown_mushroom_normal.json b/data/minecraft/worldgen/configured_feature/brown_mushroom_normal.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/crimson_forest_vegetation.json b/data/minecraft/worldgen/configured_feature/crimson_forest_vegetation.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/crimson_fungi.json b/data/minecraft/worldgen/configured_feature/crimson_fungi.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/delta.json b/data/minecraft/worldgen/configured_feature/delta.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/glowstone.json b/data/minecraft/worldgen/configured_feature/glowstone.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/glowstone_extra.json b/data/minecraft/worldgen/configured_feature/glowstone_extra.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/large_basalt_columns.json b/data/minecraft/worldgen/configured_feature/large_basalt_columns.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/nether_sprouts.json b/data/minecraft/worldgen/configured_feature/nether_sprouts.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/ore_blackstone.json b/data/minecraft/worldgen/configured_feature/ore_blackstone.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/ore_debris_large.json b/data/minecraft/worldgen/configured_feature/ore_debris_large.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/ore_debris_small.json b/data/minecraft/worldgen/configured_feature/ore_debris_small.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/ore_gold_deltas.json b/data/minecraft/worldgen/configured_feature/ore_gold_deltas.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/ore_gold_nether.json b/data/minecraft/worldgen/configured_feature/ore_gold_nether.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/ore_gravel_nether.json b/data/minecraft/worldgen/configured_feature/ore_gravel_nether.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/ore_magma.json b/data/minecraft/worldgen/configured_feature/ore_magma.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/ore_netherrack_crimson.json b/data/minecraft/worldgen/configured_feature/ore_netherrack_crimson.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/ore_netherrack_warped.json b/data/minecraft/worldgen/configured_feature/ore_netherrack_warped.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/ore_quartz_deltas.json b/data/minecraft/worldgen/configured_feature/ore_quartz_deltas.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/ore_quartz_nether.json b/data/minecraft/worldgen/configured_feature/ore_quartz_nether.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/ore_soul_sand.json b/data/minecraft/worldgen/configured_feature/ore_soul_sand.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/patch_crimson_roots.json b/data/minecraft/worldgen/configured_feature/patch_crimson_roots.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/patch_fire.json b/data/minecraft/worldgen/configured_feature/patch_fire.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/patch_soul_fire.json b/data/minecraft/worldgen/configured_feature/patch_soul_fire.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/red_mushroom_nether.json b/data/minecraft/worldgen/configured_feature/red_mushroom_nether.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/red_mushroom_normal.json b/data/minecraft/worldgen/configured_feature/red_mushroom_normal.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/small_basalt_columns.json b/data/minecraft/worldgen/configured_feature/small_basalt_columns.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/soul_sand_beaches.json b/data/minecraft/worldgen/configured_feature/soul_sand_beaches.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/soul_sand_surface.json b/data/minecraft/worldgen/configured_feature/soul_sand_surface.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/soul_shore.json b/data/minecraft/worldgen/configured_feature/soul_shore.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/spring_closed.json b/data/minecraft/worldgen/configured_feature/spring_closed.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/spring_closed_double.json b/data/minecraft/worldgen/configured_feature/spring_closed_double.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/spring_delta.json b/data/minecraft/worldgen/configured_feature/spring_delta.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/spring_lava.json b/data/minecraft/worldgen/configured_feature/spring_lava.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/spring_lava_double.json b/data/minecraft/worldgen/configured_feature/spring_lava_double.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/spring_open.json b/data/minecraft/worldgen/configured_feature/spring_open.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/twisting_vines.json b/data/minecraft/worldgen/configured_feature/twisting_vines.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/warped_forest_vegetation.json b/data/minecraft/worldgen/configured_feature/warped_forest_vegetation.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/warped_fungi.json b/data/minecraft/worldgen/configured_feature/warped_fungi.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/configured_feature/weeping_vines.json b/data/minecraft/worldgen/configured_feature/weeping_vines.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/noise_settings/nether.json b/data/minecraft/worldgen/noise_settings/nether.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/basalt_blobs.json b/data/minecraft/worldgen/placed_feature/basalt_blobs.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/basalt_pillar.json b/data/minecraft/worldgen/placed_feature/basalt_pillar.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/blackstone_blobs.json b/data/minecraft/worldgen/placed_feature/blackstone_blobs.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/brown_mushroom_nether.json b/data/minecraft/worldgen/placed_feature/brown_mushroom_nether.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/crimson_forest_vegetation.json b/data/minecraft/worldgen/placed_feature/crimson_forest_vegetation.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/crimson_fungi.json b/data/minecraft/worldgen/placed_feature/crimson_fungi.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/delta.json b/data/minecraft/worldgen/placed_feature/delta.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/glowstone.json b/data/minecraft/worldgen/placed_feature/glowstone.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/glowstone_extra.json b/data/minecraft/worldgen/placed_feature/glowstone_extra.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/large_basalt_columns.json b/data/minecraft/worldgen/placed_feature/large_basalt_columns.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/nether_sprouts.json b/data/minecraft/worldgen/placed_feature/nether_sprouts.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/ore_ancient_debris_large.json b/data/minecraft/worldgen/placed_feature/ore_ancient_debris_large.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/ore_blackstone.json b/data/minecraft/worldgen/placed_feature/ore_blackstone.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/ore_debris_small.json b/data/minecraft/worldgen/placed_feature/ore_debris_small.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/ore_gold_deltas.json b/data/minecraft/worldgen/placed_feature/ore_gold_deltas.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/ore_gold_nether.json b/data/minecraft/worldgen/placed_feature/ore_gold_nether.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/ore_gravel_nether.json b/data/minecraft/worldgen/placed_feature/ore_gravel_nether.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/ore_magma.json b/data/minecraft/worldgen/placed_feature/ore_magma.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/ore_quartz_deltas.json b/data/minecraft/worldgen/placed_feature/ore_quartz_deltas.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/ore_quartz_nether.json b/data/minecraft/worldgen/placed_feature/ore_quartz_nether.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/ore_soul_sand.json b/data/minecraft/worldgen/placed_feature/ore_soul_sand.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/patch_crimson_roots.json b/data/minecraft/worldgen/placed_feature/patch_crimson_roots.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/patch_fire.json b/data/minecraft/worldgen/placed_feature/patch_fire.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/patch_soul_fire.json b/data/minecraft/worldgen/placed_feature/patch_soul_fire.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/red_mushroom_nether.json b/data/minecraft/worldgen/placed_feature/red_mushroom_nether.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/small_basalt_columns.json b/data/minecraft/worldgen/placed_feature/small_basalt_columns.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/spring_closed.json b/data/minecraft/worldgen/placed_feature/spring_closed.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/spring_closed_double.json b/data/minecraft/worldgen/placed_feature/spring_closed_double.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/spring_delta.json b/data/minecraft/worldgen/placed_feature/spring_delta.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/spring_open.json b/data/minecraft/worldgen/placed_feature/spring_open.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/twisting_vines.json b/data/minecraft/worldgen/placed_feature/twisting_vines.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/warped_forest_vegetation.json b/data/minecraft/worldgen/placed_feature/warped_forest_vegetation.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/warped_fungi.json b/data/minecraft/worldgen/placed_feature/warped_fungi.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/placed_feature/weeping_vines.json b/data/minecraft/worldgen/placed_feature/weeping_vines.json old mode 100755 new mode 100644 diff --git a/data/minecraft/worldgen/structure_set/nether_complexes.json b/data/minecraft/worldgen/structure_set/nether_complexes.json index c7cb191..69d8942 100644 --- a/data/minecraft/worldgen/structure_set/nether_complexes.json +++ b/data/minecraft/worldgen/structure_set/nether_complexes.json @@ -1,23 +1,22 @@ { - "structures": [ - { - "structure": "minecraft:fortress", - "weight": 2 - }, - { - "structure": "minecraft:bastion_remnant", - "weight": 3 - } - ], - "placement": { - "type": "minecraft:random_spread", - "salt": 30084232, - "exclusion_zone": { - "other_set": "incendium:greater_structures", - "chunk_count": 16 - }, - "spacing": 20, - "separation": 8 + "structures": [ + { + "structure": "minecraft:fortress", + "weight": 2 + }, + { + "structure": "minecraft:bastion_remnant", + "weight": 3 } + ], + "placement": { + "type": "minecraft:random_spread", + "salt": 30084232, + "exclusion_zone": { + "other_set": "incendium:greater_structures", + "chunk_count": 16 + }, + "spacing": 20, + "separation": 8 } - +} \ No newline at end of file diff --git a/license.txt b/license.txt index d5c1159..c227634 100644 --- a/license.txt +++ b/license.txt @@ -1,50 +1,54 @@ -This License describes how all Stardust Labs datapacks and mods and their code may (and, conversely, may not) be used. This License is subject to change by Starmute and Stardust Labs at their SOLE DISCRETION at any time. This License was last altered on June 23, 2022. +This License describes how all Stardust Labs datapacks and mods and their code may (and, conversely, may not) be used. This License is subject to change by Starmute and Stardust Labs at their SOLE DISCRETION at any time. This License was last altered on February 5, 2023. PERMITTED USES =================== - - You are UNCONDITIONALLY PERMITTED to use any Stardust Labs datapacks and/or mods for whatever personal purpose you desire. You can use it on a singleplayer world and modify it as much as you want, as long as you don't distribute modified versions of the datapacks and/or mods. + - You are permitted to use any Stardust Labs datapacks and/or mods for whatever personal purpose you desire. You can use it on a singleplayer world and modify it as much as you want, as long as you don't distribute modified versions of the datapacks and/or mods. - - You are PERMITTED to use Stardust Labs datapacks or mods on any Minecraft server, public or private. It is recommended, but not required, that you give credit to Stardust Labs or note somewhere on your server that said datapack or mod is in use. Furthermore: + - You are permitted to use Stardust Labs datapacks or mods on any Minecraft server, public or private. It is recommended, but not required, that you give credit to Stardust Labs or note somewhere on your server that said datapack or mod is in use. Furthermore: * You are additionally permitted to use Stardust Labs datapacks and mods in any MODIFIED form on any Minecraft server, public or private, provided that you do not distribute any modified versions of said datapacks or mods. - - You are PERMITTED to use Stardust Labs datapacks or mods in their UNMODIFIED form as part of a publicly distributed modpack. If you do so, you MUST give credit to Stardust Labs and include a link to the relevant datapack or mod. The datapack or mod must be used in its whole form (besides any compatibility addons for other datapacks.) + - You are permitted to use Stardust Labs datapacks or mods in their UNMODIFIED form as part of a publicly distributed modpack. If you do so, you MUST give credit to Stardust Labs and include a link to the relevant datapack or mod. The datapack or mod must be used in its whole form (besides any compatibility addons for other datapacks.) - - You are PERMITTED to use Stardust Labs datapacks or mods as part of for-profit endeavors such as servers and modpacks, as long as the other guidelines of this License have been followed, appropriate credit has been given, and as long as you have not been specifically prohibited from doing so. + - You are permitted to use Stardust Labs datapacks or mods as part of for-profit endeavors such as servers and modpacks, as long as the other guidelines of this License have been followed, appropriate credit has been given, and as long as you have not been specifically prohibited from doing so. PROHIBITED USES ==================== - - You are FORBIDDEN to reupload, republish, or redistribute any Stardust Labs datapack or mod in a standalone format. + - You are forbidden to reupload, republish, or redistribute any Stardust Labs datapack or mod in a standalone format. - - You are FORBIDDEN to reupload, republish, or redistribute any modified version of any Stardust Labs datapack or mod on its own. + - You are forbidden to reupload, republish, or redistribute any modified version of any Stardust Labs datapack or mod on its own. - - You are FORBIDDEN to use any Stardust Labs datapack in any publicly distributed "datapack-pack" without Starmute's express permission. A "datapack-pack" is a collection of datapacks offered for download in a bundled form, which is distinct from a modpack because it can be used on an unmodified client. + - You are forbidden to use any Stardust Labs datapack in any publicly distributed "datapack-pack" without Starmute's express permission. A "datapack-pack" is a collection of datapacks offered for download in a bundled form, which is distinct from a modpack because it can be used on an unmodified client. - - You are FORBIDDEN to use any modified version of any Stardust Labs datapack as part of any publicly distributed modpack or "datapack-pack" without permission. This includes cases where the datapack is required to be downloaded separately, with parts being overridden. There are three exceptions to this: + - You are forbidden to use any modified version of any Stardust Labs datapack as part of any publicly distributed modpack or "datapack-pack" without permission. This includes cases where the datapack is required to be downloaded separately, with parts being overridden. There are three exceptions to this: - i) Changing the world seed or adding any seed randomizing functionality is allowed. + i) Adding structures to the pack or altering structure generation (besides altering the datapack's own structures) is allowed. - ii) Adding structures to the pack or altering structure generation (besides altering the datapack's own structures) is allowed. + ii) Modifying loot tables is allowed unconditionally. - iii) Modifying loot tables is allowed unconditionally. + * It is recommended that, if parts of a Stardust Labs datapack need to be modified, an add-on datapack is created, without use of any code owned by Stardust Labs, to override the necessary data. - - You are FORBIDDEN to use portions of any Stardust Labs datapack or mod's code as part of any other datapack, "datapack-pack", modpack or mod without express permission. You are free to read the code and use it as a resource to learn from, but copying parts of it into another project is not allowed. There is one exception for this: + - You are forbidden to use portions of any Stardust Labs datapack or mod's code as part of any other datapack, "datapack-pack", modpack or mod without express permission. You are free to read the code and use it as a resource to learn from, but copying parts of it into another project is not allowed. There is one exception for this: i) Making compatibility addons between Stardust Labs datapacks and other datapacks is allowed. + - All parties (including individuals, companies, organizations and any other groups), without permission from Stardust Labs, are expressly forbidden from using Stardust Labs properties, textures, code, and other works, as part of a training dataset for artificial intelligence, neural networks, or other generative systems. Additionally, any and all code, textures, and all other products (digitial or physical), created and owned by Stardust Labs or its members, may not be used to configure, test, debug, or augment any artificial intelligence, neural network, or other generative system. + + * This prohibition applies even if the resulting system does not store, refer to or directly call from code, textures, or other works owned by Stardust Labs. + + * In short: You are banned from using anything created by Stardust Labs as part of any AI project. + EXEMPTIONS ============= - - - Anyone currently employed by Mojang Studios is granted UNCONDITIONAL PERMISSION to use any part of any Stardust Labs datapack or mod, or its code, for any purpose relating to Minecraft's development. - Stardust Labs reserves the right to prohibit certain individuals and groups from profiting off of these Projects at our SOLE DISCRETION. However, no individual or group will be prohibited from using these Projects for personal purposes, or any purpose that does not involve profit, as long as the other guidelines of this License have been followed. OFFICIAL PERMISSION ========================== -It should be assumed that, given Stardust Labs holds full copyright over all parts of its datapacks, that any part of this License can be overriden on an individual basis with the permission of Stardust Labs. Stardust Labs reserves the right to create and distribute modified versions of these datapacks or mods at any time, for any reason, whether personal or commissioned. \ No newline at end of file +It should be assumed that, given Stardust Labs holds full copyright over all parts of its datapacks, that any part of this License can be overriden on an individual basis with the permission of Stardust Labs. Stardust Labs reserves the right to create and distribute modified versions of these datapacks or mods at any time, for any reason, whether personal or commissioned. diff --git a/pack.mcmeta b/pack.mcmeta old mode 100755 new mode 100644 diff --git a/patrons.txt b/patrons.txt new file mode 100644 index 0000000..23e2502 --- /dev/null +++ b/patrons.txt @@ -0,0 +1,87 @@ +Patreon Supporters + +Special thanks to all of our Patrons for supporting us! Here is a list of all patrons in our +Discord server (https://discord.gg/stardustlabs) at the time of publishing this version. + +Overlord: +- Archemyst +- Kai＿カイ +- Onehandedgamer +- Crash Cringle +- Cyprezz +- Kuma + +Inferno: +- M3lon +- The Lumberjack +- Esron +- CyroInferno +- Blu +- blaze +- DaUltraMarine +- chimericdream +- SoundMeister_ +- Brian Saviano +- LucidReverical + +Sentry: +- Greed +- fortis +- yonderbean +- ShadowNguyen +- ahdont +- Oogab00ga94 +- Razaekel +- Nik +- matt -_- +- Jwaffles +- FixingGlobe +- jackdshoe +- Dettlaff van der Eretein +- CAVMOT +- Janetyqua +- LeoTheRavioli +- swuff★ +- catter +- vedran +- Encrypted +- Matt +- moomakai +- char +- Ravs +- Kali +- Rhinorulz +- BlackHawk185 +- APR1L +- joemassdsd +- theAstra +- ⧎1905.08669 +- Ender +- Cr1ms0n +- viviandarkbloom +- Hecking Rat +- GreatBlackShark +- timtijmen +- NonplussedUltra +- LKv +- flydrcar +- TiTAN +- Finder17 + +Blaze: +- Zapdos +- Birch +- Hound +- btwimacat_meow +- plasmarob +- gaarai +- Redhawk +- Defenfiver +- Xeflogna +- Angryelmo +- Hoponopono +- Charleston +- Olofson +- SirFluffyPuffs +- Trashbag +- SirFluffyPuffs diff --git a/scripts/file_rename.py b/scripts/file_rename.py deleted file mode 100644 index 9c1e85e..0000000 --- a/scripts/file_rename.py +++ /dev/null @@ -1,27 +0,0 @@ -from pathlib import Path -from tqdm import tqdm - - -def action(file_type): - files = Path(".").rglob(file_type) - loop = tqdm(list(files)) - - for file in loop: - loop.set_description(file.name) - loop.set_postfix(action="Reading") - contents = file.read_text() - loop.set_postfix(action="Checking") - if "starmute:" in contents or "nether:" in contents: - loop.set_postfix(action="Replacing") - contents = contents.replace( - "starmute:", "incendium:").replace( - "nether:", "incendium:" - ) - - loop.set_postfix(action="Writing") - file.write_text(contents) - - -action("*.mcfunction") -action("*.json") -action("*.allay") diff --git a/scripts/nbt_swap.py b/scripts/nbt_swap.py deleted file mode 100644 index 18d20c7..0000000 --- a/scripts/nbt_swap.py +++ /dev/null @@ -1,31 +0,0 @@ -import nbtlib -from pathlib import Path -from tqdm import tqdm - -import os - -total_size = 0 -for filepath in tqdm(list(Path("data").rglob("*.nbt")), unit="files"): - total_size += os.stat(filepath).st_size - -files = list(Path("data").rglob("*.nbt")) -pbar = tqdm(total=total_size, unit="B", unit_scale=True, unit_divisor=1024) -for file in files: - pbar.set_description(f"Processing {file.name}") - pbar.set_postfix(action="Loading") - - with nbtlib.load(file) as data: - pbar.set_postfix(action="Unserializing") - raw = data.root.snbt() - - pbar.set_postfix(action="Replacing") - changed = raw.replace("incendium:", "incendium:").replace( - "incendium:", "incendium:" - ) - - pbar.set_postfix(action="Serializing") - data.root = nbtlib.parse_nbt(changed) - - pbar.set_postfix(action="Saving") - - pbar.update(file.stat().st_size)