Compare commits

..

No commits in common. "fcd12352fc04ccd706d219711c77834779c0d153" and "e50d3fc69a1fd1fda5c95dff13ca876b7e9d41d0" have entirely different histories.

416 changed files with 873 additions and 1028 deletions

View file

@ -27,9 +27,6 @@ repositories {
maven { maven {
url = "https://maven.theillusivec4.top/" url = "https://maven.theillusivec4.top/"
} }
maven {
url = uri("https://maven.octo-studios.com/releases")
}
} }
base { base {
@ -101,7 +98,8 @@ dependencies {
compileOnly "mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}" compileOnly "mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}"
runtimeOnly "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}" runtimeOnly "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"
implementation "top.theillusivec4.curios:curios-neoforge:${curios_version}" // runtimeOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}"
// compileOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}:api"
compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}:api" compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}:api"
runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}" runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}"
@ -127,7 +125,6 @@ tasks.withType(ProcessResources).configureEach {
loader_version_range: loader_version_range, loader_version_range: loader_version_range,
mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
mod_authors : mod_authors, mod_description: mod_description, mod_authors : mod_authors, mod_description: mod_description,
patchouli_version : patchouli_version
] ]
inputs.properties replaceProperties inputs.properties replaceProperties

View file

@ -19,7 +19,8 @@ neo_version_range=[21.1.0,)
loader_version_range=[4,) loader_version_range=[4,)
jei_version=19.18.3.204 jei_version=19.18.3.204
curios_version=9.0.11+1.21 # TODO what to do about curios being discontinued? try out https://www.curseforge.com/minecraft/mc-mods/adorned?
# curios_version=7.2.0+1.20.4
patchouli_version=1.21-87-NEOFORGE patchouli_version=1.21-87-NEOFORGE
## Mod Properties ## Mod Properties
@ -31,7 +32,7 @@ mod_name=NaturesAura
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=MIT mod_license=MIT
# The mod version. See https://semver.org/ # The mod version. See https://semver.org/
mod_version=41.0 mod_version=40.1
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources. # This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

View file

@ -1,11 +0,0 @@
{
"entities": [
"minecraft:player"
],
"slots": [
"charm",
"belt",
"ring",
"necklace"
]
}

View file

@ -1,4 +1 @@
{ {}
"add_cosmetic": true,
"size": 1
}

View file

@ -1,4 +1 @@
{ {}
"add_cosmetic": true,
"size": 1
}

View file

@ -1,4 +1 @@
{ {}
"add_cosmetic": true,
"size": 1
}

View file

@ -1,4 +1 @@
{ {}
"add_cosmetic": true,
"size": 1
}

View file

@ -7,16 +7,14 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"predicates": { "enchantments": [
"minecraft:enchantments": [ {
{ "enchantment": "minecraft:silk_touch",
"enchantments": "minecraft:silk_touch", "levels": {
"levels": { "min": 1
"min": 1
}
} }
] }
} ]
} }
} }
], ],

View file

@ -7,16 +7,14 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"predicates": { "enchantments": [
"minecraft:enchantments": [ {
{ "enchantment": "minecraft:silk_touch",
"enchantments": "minecraft:silk_touch", "levels": {
"levels": { "min": 1
"min": 1
}
} }
] }
} ]
} }
} }
], ],

View file

@ -13,16 +13,14 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"predicates": { "enchantments": [
"minecraft:enchantments": [ {
{ "enchantment": "minecraft:silk_touch",
"enchantments": "minecraft:silk_touch", "levels": {
"levels": { "min": 1
"min": 1
}
} }
] }
} ]
} }
} }
], ],

View file

@ -13,16 +13,14 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"predicates": { "enchantments": [
"minecraft:enchantments": [ {
{ "enchantment": "minecraft:silk_touch",
"enchantments": "minecraft:silk_touch", "levels": {
"levels": { "min": 1
"min": 1
}
} }
] }
} ]
} }
} }
], ],

Some files were not shown because too many files have changed in this diff Show more