Skip to content

Commit

Permalink
extract halloween content
Browse files Browse the repository at this point in the history
  • Loading branch information
PssbleTrngle committed Oct 29, 2024
1 parent 11f15be commit 1e69b2a
Show file tree
Hide file tree
Showing 3,546 changed files with 13,973 additions and 47,314 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 0 additions & 3 deletions .vscode/settings.json

This file was deleted.

16 changes: 3 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ minecraft {
}

data {
args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/'), "--existing-mod", "blueprint", "--existing-mod", "shieldexp"
args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/'), "--existing-mod", "blueprint"
taskName 'Data'
}

Expand Down Expand Up @@ -106,19 +106,13 @@ dependencies {
}

// Compatibilities
//runtimeOnly(fg.deobf("maven.modrinth:create:${create_version}"))
implementation(fg.deobf("maven.modrinth:farmers-delight:${farmersdelight_version}"))
implementation(fg.deobf("maven.modrinth:nethers-delight:${nethersdelight_version}"))
implementation(fg.deobf("maven.modrinth:shield-expansion:${shieldexpansion_version}"))
implementation(fg.deobf("maven.modrinth:create:${create_version}"))
implementation(fg.deobf("maven.modrinth:supplementaries:${supplementaries_version}"))
implementation(fg.deobf("maven.modrinth:amendments:${amendments_version}"))
implementation(fg.deobf("maven.modrinth:amendments:${amendments_version}"))
implementation(fg.deobf("maven.modrinth:moonlight:${moonlight_lib_version}"))

// For dev testing
runtimeOnly(fg.deobf("maven.modrinth:scannable:${scannable_version}"))
runtimeOnly(fg.deobf("maven.modrinth:architectury-api:${architectury_version}"))
runtimeOnly(fg.deobf("maven.modrinth:oreganized:${oreganized_version}"))
runtimeOnly(fg.deobf("maven.modrinth:dye-depot:${dye_depot_version}"))

/// Utilities for the development environment
//runtimeOnly fg.deobf("curse.maven:jade-324717:${jade_version}")
Expand All @@ -127,10 +121,6 @@ dependencies {
compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}"))
// at runtime, use the full JEI jar for Forge
runtimeOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}"))

runtimeOnly(fg.deobf("maven.modrinth:scannable:${scannable_version}"))
runtimeOnly(fg.deobf("maven.modrinth:architectury-api:${architectury_version}"))
///
}

jar {
Expand Down
16 changes: 6 additions & 10 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Project
version=3.2.0
group=galena
mod_name=Oreganized
mod_author=Xaidee as part of Team Galena
mod_id=oreganized
mod_name=Doom & Gloom
mod_author=Team Galena
mod_id=doom_and_gloom

# Gradle
org.gradle.jvmargs=-Xmx4G
Expand All @@ -13,7 +13,7 @@ org.gradle.daemon=false
minecraft_version=1.20.1

# Forge
forgegradle_version=5.1.+
forgegradle_version=[6.0,6.2)
forge_version=47.3.0

# Mixin
Expand All @@ -25,12 +25,8 @@ mixin_extras_version=0.4.1
blueprint_version=7.1.0
jei_version=15.0.0.12

farmersdelight_version=1.20.1-1.2.4
nethersdelight_version=MTDQhZd2
shieldexpansion_version=8mpKmudC
create_version=ZZW2y7nG
oreganized_version=lkBhpYKn
dye_depot_version=cdGlC270
supplementaries_version=eMF95dNK
amendments_version=qE7sokDv
scannable_version=2FlwUOgm
architectury_version=tBWqtdBO
moonlight_lib_version=sfzdPwZX
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 4 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStorePath=wrapper/dists
Loading

0 comments on commit 1e69b2a

Please sign in to comment.