Merge branch '1.19.3' into 1.19.4

* 1.19.3: Fixes Use version # Conflicts: # gradle.properties
Faboslav · Sep 21, 2024 · 046fc7f · 046fc7f
2 parents ade1f1f + 3a3a2b4
commit 046fc7f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesItems.java b/common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesItems.java
@@ -21,7 +21,7 @@ public final class FriendsAndFoesItems
 {
 	public static final ResourcefulRegistry<Item> ITEMS = ResourcefulRegistries.create(Registries.ITEM, FriendsAndFoes.MOD_ID);
 
-	public final static RegistryEntry<Item> COPPER_GOLEM_SPAWN_EGG = ITEMS.register("copper_golem_spawn_egg", () -> new DispenserAddedSpawnEgg(FriendsAndFoesEntityTypes.COPPER_GOLEM, 0x9A5038, 0xE3826C, new Item.Settings().maxCount(64)));
+	public final static RegistryEntry<Item> COPPER_GOLEM_SPAWN_EGG = ITEMS.register("copper_golem_spawn_egg", () -> new DispenserAddedSpawnEgg(FriendsAndFoesEntityTypes.COPPER_GOLEM, 0x9A5038, 0xFC9982, new Item.Settings().maxCount(64)));
 	public final static RegistryEntry<Item> CRAB_SPAWN_EGG = ITEMS.register("crab_spawn_egg", () -> new DispenserAddedSpawnEgg(FriendsAndFoesEntityTypes.CRAB, 0x333077, 0xFE984B, new Item.Settings().maxCount(64)));
 	public final static RegistryEntry<Item> GLARE_SPAWN_EGG = ITEMS.register("glare_spawn_egg", () -> new DispenserAddedSpawnEgg(FriendsAndFoesEntityTypes.GLARE, 0x70922D, 0x6A5227, new Item.Settings().maxCount(64)));
 	public final static RegistryEntry<Item> ICEOLOGER_SPAWN_EGG = ITEMS.register("iceologer_spawn_egg", () -> new DispenserAddedSpawnEgg(FriendsAndFoesEntityTypes.ICEOLOGER, 0x173873, 0x949B9B, new Item.Settings().maxCount(64)));

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -26,7 +26,7 @@ configurations {
 dependencies {
 	// Core dependencies
 	modImplementation("net.fabricmc:fabric-loader:${fabric_loader_version}")
-	modApi("net.fabricmc.fabric-api:fabric-api:${fabric_api_version}+${min_minecraft_version}")
+	modApi("net.fabricmc.fabric-api:fabric-api:${fabric_api_version}+${minecraft_version}")
 
 	// Mixin extras (https://github.com/LlamaLad7/MixinExtras)
 	include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${mixin_extras_version}")))

diff --git a/gradle.properties b/gradle.properties
@@ -33,7 +33,7 @@ cca_version=5.2.2
 curios_version=5.1.5.4
 
 # Fabric https://fabricmc.net/versions.html
-fabric_loader_version=0.14.25
+fabric_loader_version=0.16.5
 fabric_api_version=0.87.2
 
 # Forge https://files.minecraftforge.net/net/minecraftforge/forge