Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
NielsPilgaard committed Oct 11, 2021
2 parents 059f59d + ccfcee4 commit 9fae0d4
Show file tree
Hide file tree
Showing 110 changed files with 13,927 additions and 33 deletions.
1 change: 1 addition & 0 deletions .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ _Note: `.bat` files are for Windows, `.sh` are for Mac / Linux._
2. Open the `automation` folder.
3. Run the script `InstanceSyncSetup`.
4. Run the script `update-server`.
5. The script `start-automated-server` is now available in the root folder - Run it to start the server.

Re-run the script `update-server` whenever you want to update to a new modpack version.

Expand Down
24 changes: 0 additions & 24 deletions .github/support.yml

This file was deleted.

11 changes: 11 additions & 0 deletions .github/workflows/support.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

name: Support Requests

on:
issues:
types: [labeled, unlabeled, reopened]


jobs:
support-requests:
uses: NillerMedDild/.github/.github/workflows/support.yml@master

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

44 changes: 44 additions & 0 deletions kubejs/assets/enigmatica/lang/af_za.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"domain.enigmatica.display_name": "Enigmatica 6",
"block.minecraft.nether_portal.name": "Nether Portal",
"block.minecraft.stonecutter": "Stonecutter",
"container.stonecutter": "Stonecutter",
"block.tetra.hammer_head": "Hammer head",
"curios.identifier.goggles": "Goggles",
"entity.minecraft.villager.beekeeper": "Beekeeper",
"entity.minecraft.villager.immersiveengineering.gunsmith": "Gunsmith",
"entity.minecraft.villager.immersiveengineering:outfitter": "Outfitter",
"entity.minecraft.villager.immersiveengineering:electrician": "Electrician",
"entity.minecraft.villager.immersiveengineering:machinist": "Machinist",
"entity.minecraft.villager.immersiveengineering:engineer": "Engineer",
"entity.minecraft.villager.pneumaticcraft:mechanic": "Mechanic",
"entity.minecraft.villager.advancedperipherals.computer_scientist": "Computer Scientist",
"entity.projectvibrantjourneys.frog": "Frog",
"desc.immersiveengineering.info.mineral.abyssalite": "Abyssalite",
"desc.immersiveengineering.info.mineral.kimberlite": "Kimberlite",
"desc.immersiveengineering.info.mineral.thymarian_fossil_bed": "Thymarian Fossil Bed",
"desc.immersiveengineering.info.mineral.prismatic_xyloretinite": "Prismatic Xyloretinite",
"desc.immersiveengineering.info.mineral.cloggranite": "Cloggranite",
"desc.immersiveengineering.info.mineral.erythrite": "Erythrite",
"desc.immersiveengineering.info.mineral.camlannite": "Camlannite",
"desc.immersiveengineering.info.mineral.myrddinite": "Myrddinite",
"desc.immersiveengineering.info.mineral.vivacious_metamorphic_rock": "Vivacious Metamorphic Rock",
"desc.immersiveengineering.info.mineral.arid_metamorphic_rock": "Arid Metamorphic Rock",
"desc.immersiveengineering.info.mineral.prismatic_corundum_cluster": "Prismatic Corundum Cluster",
"desc.immersiveengineering.info.mineral.horodric_digsite": "Horodric Digsite",
"desc.immersiveengineering.info.mineral.naqada": "Naqada",
"advancements.enigmatica.husbandry.tame_all_animals.title": "Zoology",
"advancements.enigmatica.husbandry.tame_all_animals.description": "Tame every animal there is to tame!",
"block.naturesaura.infused_iron_block": "Infused Sunmetal Block",
"item.naturesaura.infused_iron": "Infused Sunmetal Ingot",
"block.eidolon.candle": "Consecrated Candle",
"block.eidolon.candlestick": "Consecrated Candlestick",
"block.occultism.candle_white": "Profaned Candle",
"item.occultism.otherstone_tablet": "Otherstone Slate",
"item.bloodmagic.demonwillgauge": "Demonic Will Gauge",
"item.bloodmagic.corrupted_dust": "Demonic Will Crystal Powder",
"item.bloodmagic.corrupted_tinydust": "Tiny Demonic Will Crystal Powder",
"fluid.undergarden.virulent_mix_source": "Virulent Mix",
"fluid.bloodmagic.life_essence_fluid": "Life Essence",
"": ""
}
44 changes: 44 additions & 0 deletions kubejs/assets/enigmatica/lang/ar_sa.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"domain.enigmatica.display_name": "Enigmatica 6",
"block.minecraft.nether_portal.name": "Nether Portal",
"block.minecraft.stonecutter": "Stonecutter",
"container.stonecutter": "Stonecutter",
"block.tetra.hammer_head": "Hammer head",
"curios.identifier.goggles": "Goggles",
"entity.minecraft.villager.beekeeper": "Beekeeper",
"entity.minecraft.villager.immersiveengineering.gunsmith": "Gunsmith",
"entity.minecraft.villager.immersiveengineering:outfitter": "Outfitter",
"entity.minecraft.villager.immersiveengineering:electrician": "Electrician",
"entity.minecraft.villager.immersiveengineering:machinist": "Machinist",
"entity.minecraft.villager.immersiveengineering:engineer": "Engineer",
"entity.minecraft.villager.pneumaticcraft:mechanic": "Mechanic",
"entity.minecraft.villager.advancedperipherals.computer_scientist": "Computer Scientist",
"entity.projectvibrantjourneys.frog": "Frog",
"desc.immersiveengineering.info.mineral.abyssalite": "Abyssalite",
"desc.immersiveengineering.info.mineral.kimberlite": "Kimberlite",
"desc.immersiveengineering.info.mineral.thymarian_fossil_bed": "Thymarian Fossil Bed",
"desc.immersiveengineering.info.mineral.prismatic_xyloretinite": "Prismatic Xyloretinite",
"desc.immersiveengineering.info.mineral.cloggranite": "Cloggranite",
"desc.immersiveengineering.info.mineral.erythrite": "Erythrite",
"desc.immersiveengineering.info.mineral.camlannite": "Camlannite",
"desc.immersiveengineering.info.mineral.myrddinite": "Myrddinite",
"desc.immersiveengineering.info.mineral.vivacious_metamorphic_rock": "Vivacious Metamorphic Rock",
"desc.immersiveengineering.info.mineral.arid_metamorphic_rock": "Arid Metamorphic Rock",
"desc.immersiveengineering.info.mineral.prismatic_corundum_cluster": "Prismatic Corundum Cluster",
"desc.immersiveengineering.info.mineral.horodric_digsite": "Horodric Digsite",
"desc.immersiveengineering.info.mineral.naqada": "Naqada",
"advancements.enigmatica.husbandry.tame_all_animals.title": "Zoology",
"advancements.enigmatica.husbandry.tame_all_animals.description": "Tame every animal there is to tame!",
"block.naturesaura.infused_iron_block": "Infused Sunmetal Block",
"item.naturesaura.infused_iron": "Infused Sunmetal Ingot",
"block.eidolon.candle": "Consecrated Candle",
"block.eidolon.candlestick": "Consecrated Candlestick",
"block.occultism.candle_white": "Profaned Candle",
"item.occultism.otherstone_tablet": "Otherstone Slate",
"item.bloodmagic.demonwillgauge": "Demonic Will Gauge",
"item.bloodmagic.corrupted_dust": "Demonic Will Crystal Powder",
"item.bloodmagic.corrupted_tinydust": "Tiny Demonic Will Crystal Powder",
"fluid.undergarden.virulent_mix_source": "Virulent Mix",
"fluid.bloodmagic.life_essence_fluid": "Life Essence",
"": ""
}
44 changes: 44 additions & 0 deletions kubejs/assets/enigmatica/lang/da_dk.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"domain.enigmatica.display_name": "Enigmatica 6",
"block.minecraft.nether_portal.name": "Nether Portal",
"block.minecraft.stonecutter": "Stonecutter",
"container.stonecutter": "Stonecutter",
"block.tetra.hammer_head": "Hammer head",
"curios.identifier.goggles": "Goggles",
"entity.minecraft.villager.beekeeper": "Beekeeper",
"entity.minecraft.villager.immersiveengineering.gunsmith": "Gunsmith",
"entity.minecraft.villager.immersiveengineering:outfitter": "Outfitter",
"entity.minecraft.villager.immersiveengineering:electrician": "Electrician",
"entity.minecraft.villager.immersiveengineering:machinist": "Machinist",
"entity.minecraft.villager.immersiveengineering:engineer": "Engineer",
"entity.minecraft.villager.pneumaticcraft:mechanic": "Mechanic",
"entity.minecraft.villager.advancedperipherals.computer_scientist": "Computer Scientist",
"entity.projectvibrantjourneys.frog": "Frog",
"desc.immersiveengineering.info.mineral.abyssalite": "Abyssalite",
"desc.immersiveengineering.info.mineral.kimberlite": "Kimberlite",
"desc.immersiveengineering.info.mineral.thymarian_fossil_bed": "Thymarian Fossil Bed",
"desc.immersiveengineering.info.mineral.prismatic_xyloretinite": "Prismatic Xyloretinite",
"desc.immersiveengineering.info.mineral.cloggranite": "Cloggranite",
"desc.immersiveengineering.info.mineral.erythrite": "Erythrite",
"desc.immersiveengineering.info.mineral.camlannite": "Camlannite",
"desc.immersiveengineering.info.mineral.myrddinite": "Myrddinite",
"desc.immersiveengineering.info.mineral.vivacious_metamorphic_rock": "Vivacious Metamorphic Rock",
"desc.immersiveengineering.info.mineral.arid_metamorphic_rock": "Arid Metamorphic Rock",
"desc.immersiveengineering.info.mineral.prismatic_corundum_cluster": "Prismatic Corundum Cluster",
"desc.immersiveengineering.info.mineral.horodric_digsite": "Horodric Digsite",
"desc.immersiveengineering.info.mineral.naqada": "Naqada",
"advancements.enigmatica.husbandry.tame_all_animals.title": "Zoology",
"advancements.enigmatica.husbandry.tame_all_animals.description": "Tame every animal there is to tame!",
"block.naturesaura.infused_iron_block": "Infused Sunmetal Block",
"item.naturesaura.infused_iron": "Infused Sunmetal Ingot",
"block.eidolon.candle": "Consecrated Candle",
"block.eidolon.candlestick": "Consecrated Candlestick",
"block.occultism.candle_white": "Profaned Candle",
"item.occultism.otherstone_tablet": "Otherstone Slate",
"item.bloodmagic.demonwillgauge": "Demonic Will Gauge",
"item.bloodmagic.corrupted_dust": "Demonic Will Crystal Powder",
"item.bloodmagic.corrupted_tinydust": "Tiny Demonic Will Crystal Powder",
"fluid.undergarden.virulent_mix_source": "Virulent Mix",
"fluid.bloodmagic.life_essence_fluid": "Life Essence",
"": ""
}
44 changes: 44 additions & 0 deletions kubejs/assets/enigmatica/lang/de_de.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"domain.enigmatica.display_name": "Enigmatica 6",
"block.minecraft.nether_portal.name": "Nether Portal",
"block.minecraft.stonecutter": "Stonecutter",
"container.stonecutter": "Stonecutter",
"block.tetra.hammer_head": "Hammer head",
"curios.identifier.goggles": "Goggles",
"entity.minecraft.villager.beekeeper": "Beekeeper",
"entity.minecraft.villager.immersiveengineering.gunsmith": "Gunsmith",
"entity.minecraft.villager.immersiveengineering:outfitter": "Outfitter",
"entity.minecraft.villager.immersiveengineering:electrician": "Electrician",
"entity.minecraft.villager.immersiveengineering:machinist": "Machinist",
"entity.minecraft.villager.immersiveengineering:engineer": "Engineer",
"entity.minecraft.villager.pneumaticcraft:mechanic": "Mechanic",
"entity.minecraft.villager.advancedperipherals.computer_scientist": "Computer Scientist",
"entity.projectvibrantjourneys.frog": "Frog",
"desc.immersiveengineering.info.mineral.abyssalite": "Abyssalite",
"desc.immersiveengineering.info.mineral.kimberlite": "Kimberlite",
"desc.immersiveengineering.info.mineral.thymarian_fossil_bed": "Thymarian Fossil Bed",
"desc.immersiveengineering.info.mineral.prismatic_xyloretinite": "Prismatic Xyloretinite",
"desc.immersiveengineering.info.mineral.cloggranite": "Cloggranite",
"desc.immersiveengineering.info.mineral.erythrite": "Erythrite",
"desc.immersiveengineering.info.mineral.camlannite": "Camlannite",
"desc.immersiveengineering.info.mineral.myrddinite": "Myrddinite",
"desc.immersiveengineering.info.mineral.vivacious_metamorphic_rock": "Vivacious Metamorphic Rock",
"desc.immersiveengineering.info.mineral.arid_metamorphic_rock": "Arid Metamorphic Rock",
"desc.immersiveengineering.info.mineral.prismatic_corundum_cluster": "Prismatic Corundum Cluster",
"desc.immersiveengineering.info.mineral.horodric_digsite": "Horodric Digsite",
"desc.immersiveengineering.info.mineral.naqada": "Naqada",
"advancements.enigmatica.husbandry.tame_all_animals.title": "Zoology",
"advancements.enigmatica.husbandry.tame_all_animals.description": "Tame every animal there is to tame!",
"block.naturesaura.infused_iron_block": "Infused Sunmetal Block",
"item.naturesaura.infused_iron": "Infused Sunmetal Ingot",
"block.eidolon.candle": "Consecrated Candle",
"block.eidolon.candlestick": "Consecrated Candlestick",
"block.occultism.candle_white": "Profaned Candle",
"item.occultism.otherstone_tablet": "Otherstone Slate",
"item.bloodmagic.demonwillgauge": "Demonic Will Gauge",
"item.bloodmagic.corrupted_dust": "Demonic Will Crystal Powder",
"item.bloodmagic.corrupted_tinydust": "Tiny Demonic Will Crystal Powder",
"fluid.undergarden.virulent_mix_source": "Virulent Mix",
"fluid.bloodmagic.life_essence_fluid": "Life Essence",
"": ""
}
44 changes: 44 additions & 0 deletions kubejs/assets/enigmatica/lang/es_es.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"domain.enigmatica.display_name": "Enigmatica 6",
"block.minecraft.nether_portal.name": "Nether Portal",
"block.minecraft.stonecutter": "Stonecutter",
"container.stonecutter": "Stonecutter",
"block.tetra.hammer_head": "Hammer head",
"curios.identifier.goggles": "Goggles",
"entity.minecraft.villager.beekeeper": "Beekeeper",
"entity.minecraft.villager.immersiveengineering.gunsmith": "Gunsmith",
"entity.minecraft.villager.immersiveengineering:outfitter": "Outfitter",
"entity.minecraft.villager.immersiveengineering:electrician": "Electrician",
"entity.minecraft.villager.immersiveengineering:machinist": "Machinist",
"entity.minecraft.villager.immersiveengineering:engineer": "Engineer",
"entity.minecraft.villager.pneumaticcraft:mechanic": "Mechanic",
"entity.minecraft.villager.advancedperipherals.computer_scientist": "Computer Scientist",
"entity.projectvibrantjourneys.frog": "Frog",
"desc.immersiveengineering.info.mineral.abyssalite": "Abyssalite",
"desc.immersiveengineering.info.mineral.kimberlite": "Kimberlite",
"desc.immersiveengineering.info.mineral.thymarian_fossil_bed": "Thymarian Fossil Bed",
"desc.immersiveengineering.info.mineral.prismatic_xyloretinite": "Prismatic Xyloretinite",
"desc.immersiveengineering.info.mineral.cloggranite": "Cloggranite",
"desc.immersiveengineering.info.mineral.erythrite": "Erythrite",
"desc.immersiveengineering.info.mineral.camlannite": "Camlannite",
"desc.immersiveengineering.info.mineral.myrddinite": "Myrddinite",
"desc.immersiveengineering.info.mineral.vivacious_metamorphic_rock": "Vivacious Metamorphic Rock",
"desc.immersiveengineering.info.mineral.arid_metamorphic_rock": "Arid Metamorphic Rock",
"desc.immersiveengineering.info.mineral.prismatic_corundum_cluster": "Prismatic Corundum Cluster",
"desc.immersiveengineering.info.mineral.horodric_digsite": "Horodric Digsite",
"desc.immersiveengineering.info.mineral.naqada": "Naqada",
"advancements.enigmatica.husbandry.tame_all_animals.title": "Zoology",
"advancements.enigmatica.husbandry.tame_all_animals.description": "Tame every animal there is to tame!",
"block.naturesaura.infused_iron_block": "Infused Sunmetal Block",
"item.naturesaura.infused_iron": "Infused Sunmetal Ingot",
"block.eidolon.candle": "Consecrated Candle",
"block.eidolon.candlestick": "Consecrated Candlestick",
"block.occultism.candle_white": "Profaned Candle",
"item.occultism.otherstone_tablet": "Otherstone Slate",
"item.bloodmagic.demonwillgauge": "Demonic Will Gauge",
"item.bloodmagic.corrupted_dust": "Demonic Will Crystal Powder",
"item.bloodmagic.corrupted_tinydust": "Tiny Demonic Will Crystal Powder",
"fluid.undergarden.virulent_mix_source": "Virulent Mix",
"fluid.bloodmagic.life_essence_fluid": "Life Essence",
"": ""
}
44 changes: 44 additions & 0 deletions kubejs/assets/enigmatica/lang/fr_fr.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"domain.enigmatica.display_name": "Enigmatica 6",
"block.minecraft.nether_portal.name": "Nether Portal",
"block.minecraft.stonecutter": "Stonecutter",
"container.stonecutter": "Stonecutter",
"block.tetra.hammer_head": "Hammer head",
"curios.identifier.goggles": "Goggles",
"entity.minecraft.villager.beekeeper": "Beekeeper",
"entity.minecraft.villager.immersiveengineering.gunsmith": "Gunsmith",
"entity.minecraft.villager.immersiveengineering:outfitter": "Outfitter",
"entity.minecraft.villager.immersiveengineering:electrician": "Electrician",
"entity.minecraft.villager.immersiveengineering:machinist": "Machinist",
"entity.minecraft.villager.immersiveengineering:engineer": "Engineer",
"entity.minecraft.villager.pneumaticcraft:mechanic": "Mechanic",
"entity.minecraft.villager.advancedperipherals.computer_scientist": "Computer Scientist",
"entity.projectvibrantjourneys.frog": "Frog",
"desc.immersiveengineering.info.mineral.abyssalite": "Abyssalite",
"desc.immersiveengineering.info.mineral.kimberlite": "Kimberlite",
"desc.immersiveengineering.info.mineral.thymarian_fossil_bed": "Thymarian Fossil Bed",
"desc.immersiveengineering.info.mineral.prismatic_xyloretinite": "Prismatic Xyloretinite",
"desc.immersiveengineering.info.mineral.cloggranite": "Cloggranite",
"desc.immersiveengineering.info.mineral.erythrite": "Erythrite",
"desc.immersiveengineering.info.mineral.camlannite": "Camlannite",
"desc.immersiveengineering.info.mineral.myrddinite": "Myrddinite",
"desc.immersiveengineering.info.mineral.vivacious_metamorphic_rock": "Vivacious Metamorphic Rock",
"desc.immersiveengineering.info.mineral.arid_metamorphic_rock": "Arid Metamorphic Rock",
"desc.immersiveengineering.info.mineral.prismatic_corundum_cluster": "Prismatic Corundum Cluster",
"desc.immersiveengineering.info.mineral.horodric_digsite": "Horodric Digsite",
"desc.immersiveengineering.info.mineral.naqada": "Naqada",
"advancements.enigmatica.husbandry.tame_all_animals.title": "Zoology",
"advancements.enigmatica.husbandry.tame_all_animals.description": "Tame every animal there is to tame!",
"block.naturesaura.infused_iron_block": "Infused Sunmetal Block",
"item.naturesaura.infused_iron": "Infused Sunmetal Ingot",
"block.eidolon.candle": "Consecrated Candle",
"block.eidolon.candlestick": "Consecrated Candlestick",
"block.occultism.candle_white": "Profaned Candle",
"item.occultism.otherstone_tablet": "Otherstone Slate",
"item.bloodmagic.demonwillgauge": "Demonic Will Gauge",
"item.bloodmagic.corrupted_dust": "Demonic Will Crystal Powder",
"item.bloodmagic.corrupted_tinydust": "Tiny Demonic Will Crystal Powder",
"fluid.undergarden.virulent_mix_source": "Virulent Mix",
"fluid.bloodmagic.life_essence_fluid": "Life Essence",
"": ""
}
Loading

0 comments on commit 9fae0d4

Please sign in to comment.