libreforge-updater

eco-core/core-plugin/src/main/resources/mobs/_example.yml

@@ -87,19 +87,11 @@ effects:
   # Ran from the perspective of the player
   any-attack: [ ]
 
-<<<<<<< HEAD
   # Effects ran when the mob takes damage
   # Ran from the perspective of the entity
   take-damage: [ ]
 
   # Effects ran when the player is damaged by the mob
-=======
-    # Effects ran when the mob takes damage
-  # Ran from the perspective of the entity
-  take-damage: [ ]
-
-    # Effects ran when the player is damaged by the mob
->>>>>>> f031fb51c6a3787bc44e8bc099d3655e74366f70
   # Ran from the perspective of the player
   damage-player: [ ]
 

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Mon Mar 11 17:38:41 GMT 2024
+#Wed Apr 17 20:35:35 BST 2024
 kotlin.code.style=official
-libreforge-version=4.56.5
+libreforge-version=4.58.1
-version=10.1.5
+version=10.3.1