Merge pull request #4 from FTBTeam/dev

desht · web-flow · commit 5bd873087b78 · 2023-07-24T11:41:05.000+01:00
Dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.2]
+
+### Fixed
+* Fixed crash when Game Stages is loaded, and KubeJS is not loaded.
+
 ## [1.1.1]
 
 ### Fixed
diff --git a/fabric/src/main/java/dev/ftb/mods/ftbxmodcompat/generic/gamestages/fabric/GameStagesStageProviderImpl.java b/fabric/src/main/java/dev/ftb/mods/ftbxmodcompat/generic/gamestages/fabric/GameStagesStageProviderImpl.java
@@ -1,4 +1,4 @@
-package dev.ftb.mods.ftbxmodcompat.fabric.generic.gamestages;
+package dev.ftb.mods.ftbxmodcompat.generic.gamestages.fabric;
 
 import net.minecraft.world.entity.player.Player;
 
diff --git a/forge/src/main/java/dev/ftb/mods/ftbxmodcompat/generic/gamestages/forge/GameStagesStageProviderImpl.java b/forge/src/main/java/dev/ftb/mods/ftbxmodcompat/generic/gamestages/forge/GameStagesStageProviderImpl.java
@@ -1,4 +1,4 @@
-package dev.ftb.mods.ftbxmodcompat.forge.generic.gamestages;
+package dev.ftb.mods.ftbxmodcompat.generic.gamestages.forge;
 
 import net.darkhax.gamestages.GameStageHelper;
 import net.minecraft.server.level.ServerPlayer;
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.19.2
 enabled_platforms=fabric,forge
 
 archives_base_name=ftb-xmod-compat
-mod_version=1.1.1
+mod_version=1.1.2
 maven_group=dev.ftb.mods
 curseforge_id=889915
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dev.ftb.mods.ftbxmodcompat.fabric.generic.gamestages;`
	`1`	`+package dev.ftb.mods.ftbxmodcompat.generic.gamestages.fabric;`
`2`	`2`
`3`	`3`	`import net.minecraft.world.entity.player.Player;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dev.ftb.mods.ftbxmodcompat.forge.generic.gamestages;`
	`1`	`+package dev.ftb.mods.ftbxmodcompat.generic.gamestages.forge;`
`2`	`2`
`3`	`3`	`import net.darkhax.gamestages.GameStageHelper;`
`4`	`4`	`import net.minecraft.server.level.ServerPlayer;`