Conflicts resolved

Anuken · Feb 9, 2025 · 96b2f14 · 96b2f14
2 parents aba9041 + 1aae8e9
commit 96b2f14
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 1 deletion.
diff --git a/core/assets-raw/sprites/items/liquid-cryofluid.png b/core/assets-raw/sprites/items/liquid-cryofluid.png
diff --git a/core/assets-raw/sprites/items/liquid-oil.png b/core/assets-raw/sprites/items/liquid-oil.png
diff --git a/core/assets-raw/sprites/items/liquid-slag.png b/core/assets-raw/sprites/items/liquid-slag.png
diff --git a/core/assets/contributors b/core/assets/contributors
@@ -146,7 +146,7 @@ BlueWolf
 [Error_27]
 code-explorer786
 Alex25820
-KayAyeAre
+Nullotte
 SMOLKEYS
 1stvaliduser(SUS)
 GlennFolker