Skip to content

Commit a196735

Browse files
Merge pull request #5 from Project-Vyre/dev/0.1.4
Merge dev/0.1.4 to main
2 parents 0460621 + 3aa4f9f commit a196735

File tree

185 files changed

+11073
-1034
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+11073
-1034
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,6 @@ servers.dat
5151
*.dat_old
5252
servers.essential.dat
5353
bookmark.ini
54+
config/roughlyenoughitems/hints.json
55+
config/jei/world/server/*
56+
o_prof

config/almostunified/debug.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"dumpTagMap": false,
3+
"dumpDuplicates": false,
4+
"dumpUnification": false,
5+
"dumpOverview": false,
6+
"dumpRecipes": false
7+
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"ignoredRecipeTypes": [
3+
"cucumber:shaped_tag"
4+
],
5+
"ignoredRecipes": [],
6+
"defaultDuplicateRules": {
7+
"ignoredFields": [
8+
"conditions",
9+
"group"
10+
],
11+
"rules": {
12+
"cookingtime": "HigherRule",
13+
"energy": "HigherRule",
14+
"experience": "HigherRule"
15+
},
16+
"shouldSanitize": false
17+
},
18+
"overrideDuplicateRules": {
19+
"minecraft:crafting_shaped": {
20+
"ignoredFields": [
21+
"pattern",
22+
"conditions",
23+
"key",
24+
"group"
25+
],
26+
"rules": {},
27+
"shouldSanitize": false
28+
}
29+
},
30+
"strictMode": false
31+
}

config/almostunified/startup.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"serverOnly": false
3+
}

config/almostunified/unify.json

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
{
2+
"modPriorities": [
3+
"minecraft",
4+
"kubejs",
5+
"create",
6+
"thermal",
7+
"immersiveengineering",
8+
"mekanism",
9+
"crafttweaker"
10+
],
11+
"stoneStrata": [
12+
"stone",
13+
"nether",
14+
"deepslate",
15+
"granite",
16+
"diorite",
17+
"andesite"
18+
],
19+
"tags": [
20+
"forge:nuggets/{material}",
21+
"forge:dusts/{material}",
22+
"forge:gears/{material}",
23+
"forge:gems/{material}",
24+
"forge:ingots/{material}",
25+
"forge:raw_materials/{material}",
26+
"forge:ores/{material}",
27+
"forge:plates/{material}",
28+
"forge:rods/{material}",
29+
"forge:wires/{material}",
30+
"forge:storage_blocks/{material}",
31+
"forge:storage_blocks/raw_{material}"
32+
],
33+
"materials": [
34+
"aeternium",
35+
"aluminum",
36+
"amber",
37+
"apatite",
38+
"bitumen",
39+
"brass",
40+
"bronze",
41+
"charcoal",
42+
"chrome",
43+
"cinnabar",
44+
"coal",
45+
"coal_coke",
46+
"cobalt",
47+
"constantan",
48+
"copper",
49+
"diamond",
50+
"electrum",
51+
"elementium",
52+
"emerald",
53+
"enderium",
54+
"fluorite",
55+
"gold",
56+
"graphite",
57+
"invar",
58+
"iridium",
59+
"iron",
60+
"lapis",
61+
"lead",
62+
"lumium",
63+
"mithril",
64+
"netherite",
65+
"nickel",
66+
"obsidian",
67+
"osmium",
68+
"peridot",
69+
"platinum",
70+
"potassium_nitrate",
71+
"ruby",
72+
"sapphire",
73+
"signalum",
74+
"silver",
75+
"steel",
76+
"sulfur",
77+
"tin",
78+
"tungsten",
79+
"uranium",
80+
"zinc"
81+
],
82+
"priorityOverrides": {},
83+
"tagOwnerships": {},
84+
"itemTagInheritanceMode": "ALLOW",
85+
"itemTagInheritance": {},
86+
"blockTagInheritanceMode": "ALLOW",
87+
"blockTagInheritance": {},
88+
"ignoredTags": [],
89+
"ignoredItems": [],
90+
"ignoredRecipeTypes": [
91+
"cucumber:shaped_tag"
92+
],
93+
"ignoredRecipes": [],
94+
"itemsHidingJeiRei": true
95+
}

config/apotheosis/names.cfg

Lines changed: 125 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ tools {
691691
>
692692

693693
# A list of material-based prefix names for this material group. May be empty.
694-
# Items in this group: mysticalagradditions:imperium_paxel
694+
# Items in this group: mysticalagriculture:imperium_sword, mysticalagriculture:imperium_pickaxe, mysticalagriculture:imperium_shovel, mysticalagriculture:imperium_axe, mysticalagriculture:imperium_hoe, mysticalagriculture:imperium_sickle, mysticalagriculture:imperium_scythe
695695
#
696696
# Default: [
697697
S:IMPERIUM <
@@ -775,7 +775,7 @@ tools {
775775
>
776776

777777
# A list of material-based prefix names for this material group. May be empty.
778-
# Items in this group: mysticalagradditions:tertium_paxel
778+
# Items in this group: mysticalagriculture:tertium_sword, mysticalagriculture:tertium_pickaxe, mysticalagriculture:tertium_shovel, mysticalagriculture:tertium_axe, mysticalagriculture:tertium_hoe, mysticalagriculture:tertium_sickle, mysticalagriculture:tertium_scythe
779779
#
780780
# Default: [
781781
S:TERTIUM <
@@ -789,7 +789,7 @@ tools {
789789
>
790790

791791
# A list of material-based prefix names for this material group. May be empty.
792-
# Items in this group: mysticalagradditions:inferium_paxel
792+
# Items in this group: mysticalagriculture:inferium_sword, mysticalagriculture:inferium_pickaxe, mysticalagriculture:inferium_shovel, mysticalagriculture:inferium_axe, mysticalagriculture:inferium_hoe, mysticalagriculture:inferium_sickle, mysticalagriculture:inferium_scythe
793793
#
794794
# Default: [
795795
S:INFERIUM <
@@ -854,7 +854,7 @@ tools {
854854
>
855855

856856
# A list of material-based prefix names for this material group. May be empty.
857-
# Items in this group: mysticalagriculture:awakened_supremium_sword, mysticalagriculture:awakened_supremium_pickaxe, mysticalagriculture:awakened_supremium_shovel, mysticalagriculture:awakened_supremium_axe, mysticalagriculture:awakened_supremium_hoe, mysticalagriculture:awakened_supremium_sickle, mysticalagriculture:awakened_supremium_scythe
857+
# Items in this group: mysticalagradditions:awakened_supremium_paxel
858858
#
859859
# Default: [
860860
S:AWAKENED_SUPREMIUM <
@@ -875,7 +875,7 @@ tools {
875875
>
876876

877877
# A list of material-based prefix names for this material group. May be empty.
878-
# Items in this group: mysticalagriculture:supremium_sword, mysticalagriculture:supremium_pickaxe, mysticalagriculture:supremium_shovel, mysticalagriculture:supremium_axe, mysticalagriculture:supremium_hoe, mysticalagriculture:supremium_sickle, mysticalagriculture:supremium_scythe
878+
# Items in this group: mysticalagradditions:supremium_paxel
879879
#
880880
# Default: [
881881
S:SUPREMIUM <
@@ -1172,6 +1172,48 @@ tools {
11721172
# Default: [
11731173
S:savage_and_ravage_cleaver_of_beheading <
11741174
>
1175+
1176+
# A list of material-based prefix names for this material group. May be empty.
1177+
# Items in this group: irons_spellbooks:claymore
1178+
#
1179+
# Default: [
1180+
S:CLAYMORE <
1181+
>
1182+
1183+
# A list of material-based prefix names for this material group. May be empty.
1184+
# Items in this group: irons_spellbooks:keeper_flamberge
1185+
#
1186+
# Default: [
1187+
S:KEEPER_FLAMBERGE <
1188+
>
1189+
1190+
# A list of material-based prefix names for this material group. May be empty.
1191+
# Items in this group: irons_spellbooks:magehunter
1192+
#
1193+
# Default: [
1194+
S:METAL_MAGEHUNTER <
1195+
>
1196+
1197+
# A list of material-based prefix names for this material group. May be empty.
1198+
# Items in this group: kubejs:final_katana
1199+
#
1200+
# Default: [
1201+
S:kubejs_final_katana <
1202+
>
1203+
1204+
# A list of material-based prefix names for this material group. May be empty.
1205+
# Items in this group: kubejs:final_lance
1206+
#
1207+
# Default: [
1208+
S:kubejs_final_lance <
1209+
>
1210+
1211+
# A list of material-based prefix names for this material group. May be empty.
1212+
# Items in this group: kubejs:crystal_lance
1213+
#
1214+
# Default: [
1215+
S:kubejs_crystal_lance <
1216+
>
11751217
}
11761218

11771219

@@ -1317,7 +1359,7 @@ armors {
13171359
>
13181360

13191361
# A list of material-based prefix names for this material group. May be empty.
1320-
# Items in this group: minecraft:leather_helmet, minecraft:leather_chestplate, minecraft:leather_leggings, minecraft:leather_boots, quark:forgotten_hat, quark:backpack
1362+
# Items in this group: minecraft:leather_helmet, minecraft:leather_chestplate, minecraft:leather_leggings, minecraft:leather_boots, quark:backpack, quark:forgotten_hat
13211363
#
13221364
# Default: [
13231365
S:LEATHER <
@@ -1685,6 +1727,83 @@ armors {
16851727
# Default: [
16861728
S:savage_and_ravage_mask_of_dishonesty <
16871729
>
1730+
1731+
# A list of material-based prefix names for this material group. May be empty.
1732+
# Items in this group: irons_spellbooks:archevoker_helmet, irons_spellbooks:archevoker_chestplate, irons_spellbooks:archevoker_leggings, irons_spellbooks:archevoker_boots
1733+
#
1734+
# Default: [
1735+
S:ARCHEVOKER <
1736+
>
1737+
1738+
# A list of material-based prefix names for this material group. May be empty.
1739+
# Items in this group: irons_spellbooks:wandering_magician_helmet, irons_spellbooks:wandering_magician_chestplate, irons_spellbooks:wandering_magician_leggings, irons_spellbooks:wandering_magician_boots
1740+
#
1741+
# Default: [
1742+
S:WANDERING_MAGICIAN <
1743+
>
1744+
1745+
# A list of material-based prefix names for this material group. May be empty.
1746+
# Items in this group: irons_spellbooks:cryomancer_helmet, irons_spellbooks:cryomancer_chestplate, irons_spellbooks:cryomancer_leggings, irons_spellbooks:cryomancer_boots
1747+
#
1748+
# Default: [
1749+
S:CRYOMANCER <
1750+
>
1751+
1752+
# A list of material-based prefix names for this material group. May be empty.
1753+
# Items in this group: irons_spellbooks:priest_helmet, irons_spellbooks:priest_chestplate, irons_spellbooks:priest_leggings, irons_spellbooks:priest_boots
1754+
#
1755+
# Default: [
1756+
S:PRIEST <
1757+
>
1758+
1759+
# A list of material-based prefix names for this material group. May be empty.
1760+
# Items in this group: irons_spellbooks:cultist_helmet, irons_spellbooks:cultist_chestplate, irons_spellbooks:cultist_leggings, irons_spellbooks:cultist_boots
1761+
#
1762+
# Default: [
1763+
S:CULTIST <
1764+
>
1765+
1766+
# A list of material-based prefix names for this material group. May be empty.
1767+
# Items in this group: irons_spellbooks:plagued_helmet, irons_spellbooks:plagued_chestplate, irons_spellbooks:plagued_leggings, irons_spellbooks:plagued_boots
1768+
#
1769+
# Default: [
1770+
S:PLAGUED <
1771+
>
1772+
1773+
# A list of material-based prefix names for this material group. May be empty.
1774+
# Items in this group: irons_spellbooks:pumpkin_helmet, irons_spellbooks:pumpkin_chestplate, irons_spellbooks:pumpkin_leggings, irons_spellbooks:pumpkin_boots
1775+
#
1776+
# Default: [
1777+
S:PUMPKIN <
1778+
>
1779+
1780+
# A list of material-based prefix names for this material group. May be empty.
1781+
# Items in this group: irons_spellbooks:electromancer_helmet, irons_spellbooks:electromancer_chestplate, irons_spellbooks:electromancer_leggings, irons_spellbooks:electromancer_boots
1782+
#
1783+
# Default: [
1784+
S:ELECTROMANCER <
1785+
>
1786+
1787+
# A list of material-based prefix names for this material group. May be empty.
1788+
# Items in this group: irons_spellbooks:shadowwalker_helmet, irons_spellbooks:shadowwalker_chestplate, irons_spellbooks:shadowwalker_leggings, irons_spellbooks:shadowwalker_boots
1789+
#
1790+
# Default: [
1791+
S:SHADOWWALKER <
1792+
>
1793+
1794+
# A list of material-based prefix names for this material group. May be empty.
1795+
# Items in this group: irons_spellbooks:tarnished_helmet
1796+
#
1797+
# Default: [
1798+
S:TARNISHED <
1799+
>
1800+
1801+
# A list of material-based prefix names for this material group. May be empty.
1802+
# Items in this group: irons_spellbooks:pyromancer_helmet, irons_spellbooks:pyromancer_chestplate, irons_spellbooks:pyromancer_leggings, irons_spellbooks:pyromancer_boots
1803+
#
1804+
# Default: [
1805+
S:PYROMANCER <
1806+
>
16881807
}
16891808

16901809

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#Whenever Sunstone and Moonstone update their states, there is a chance for adjacent ones to update as well.
2+
#This causes the updates to cascade and helps the blocks stay in sync over large areas.
3+
#Default is .35, for a 35% chance of each adjacent block updating.
4+
#Range: 0.0 ~ 1.0
5+
sunstoneSpreadChance = 0.35
6+
7+
#The following options require a server restart to take effect.
8+
[Restart_Required]
9+
#Architect's Palette adds trades to various villagers. This option controls if they can appear in newly generated trades.
10+
#Villagers that already sell AP items will continue to do so regardless of this setting.
11+
enableVillagerTrades = true
12+
#Enables Wandering Trader trades added by AP.
13+
enableWandererTrades = true
14+
#AP adds Vertical Slabs to be compatible with Quark. Enabling this will force those to be available even if Quark isn't loaded.
15+
verticalSlabsForced = false
16+
17+
#World Generation Options
18+
[Restart_Required.World_Gen]
19+
#Controls ALL worldgen features added by Architect's Palette.
20+
#If false, NOTHING from AP will generate. If true, individual features may still be disabled.
21+
globalWorldGenToggle = true
22+
#Controls the spawning of Monazite, Ekanite, and Heliodor rods in various Nether biomes.
23+
netherCrystalGeneration = true
24+

0 commit comments

Comments
 (0)