Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing aether_legacy softdepend (crash) #27

Open
wants to merge 1 commit into
base: 1.12
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion changelog.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
"0.3.10": "All credits for this update goes to sschr15\n- Added the Hardcore option to also be possible in survival.\n- Added a config option to enable said behavior.",
"0.3.11": "- Version bump for ModWinder support",
"0.3.12": "- FIXED A BUG!!! When possessing a creeper, spider, or enderman, GUIs work properly.\n - However, your hotbar will not show up. Already planning on looking into that.",
"0.3.13": "- Pyrofab fixed a bug caused when two mobs had the same class name."
"0.3.13": "- [@Pyrofab](//github.com/Pyrofab) fixed a bug caused when two mobs had the same class name."
}
}
5 changes: 4 additions & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ repositories {
maven {
url 'http://maven.jamieswhiteshirt.com/libs-release/'
}
maven {
url "https://cursemaven.com"
}
}

dependencies {
Expand All @@ -42,7 +45,7 @@ dependencies {
compileOnly "potion-core:PotionCore:1.6_for_${mc_version}:src"
//compileOnly "epic-siege-mod:EpicSiegeMod:13.163:sources"
deobfProvided "journeymap:journeymap:1.12.2:5.5.3"
deobfProvided "the-aether:aether_legacy:${mc_version}:${aether_version}"
deobfProvided "curse.maven:aether_legacy-255308:3280119"
deobfCompile "com.jamieswhiteshirt:clothesline-hooks:1.12.2-0.0.1.0"
compileOnly "ichunutil:iChunUtil:${mc_version}:${ichunutil_version}"
compileOnly "sync:Sync:${mc_version}:${sync_version}"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dissolution_version=0.3.13
version_nickname=r2

# Workspace
forge_version=1.12.2-14.23.5.2846
forge_version=1.12.2-14.23.5.2847
mcp_version=stable_39
ladylib_version=2.6.2
clothesline_hook_version=0.0.1.2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ladysnake.dissolution.common.compat;

import com.legacy.aether.Aether;
import com.legacy.aether.AetherConfig;
import com.legacy.aether.client.gui.inventory.GuiAccessories;
import com.gildedgames.the_aether.Aether;
import com.gildedgames.the_aether.AetherConfig;
import com.gildedgames.the_aether.client.gui.inventory.GuiAccessories;
import ladylib.compat.EnhancedBusSubscriber;
import ladysnake.dissolution.common.Ref;
import ladysnake.dissolution.common.capabilities.CapabilityIncorporealHandler;
Expand Down