merge is pain

4 files changed, 25 insertions, 25 deletions

diff --git a/src/main/resources/assets/notenoughupdates/capes/furf.png b/src/main/resources/assets/notenoughupdates/capes/furf.png
index d7d5a99f..ce9f4c19 100644
--- a/src/main/resources/assets/notenoughupdates/capes/furf.png
+++ b/src/main/resources/assets/notenoughupdates/capes/furf.png
diff --git a/src/main/resources/assets/notenoughupdates/collectionlog.png b/src/main/resources/assets/notenoughupdates/collectionlog.png
new file mode 100644
index 00000000..c30a0b8f
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/collectionlog.png
diff --git a/src/main/resources/assets/notenoughupdates/custom_enchant_gui.png b/src/main/resources/assets/notenoughupdates/custom_enchant_gui.png
new file mode 100644
index 00000000..1ad77d97
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/custom_enchant_gui.png
diff --git a/src/main/resources/mixins.notenoughupdates.json b/src/main/resources/mixins.notenoughupdates.json
index 4c0261bb..0d415976 100644
--- a/src/main/resources/mixins.notenoughupdates.json
+++ b/src/main/resources/mixins.notenoughupdates.json
@@ -3,39 +3,39 @@
   "refmap": "mixins.notenoughupdates.refmap.json",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
-    "MixinItemStack",
-    "MixinInventoryEffectRenderer",
-    "MixinGuiIngame",
-    "MixinRenderItem",
+    "MixinAbstractClientPlayer",
+    "MixinContainer",
+    "MixinEffectRenderer",
+    "MixinEntityPlayer",
+    "MixinEntityPlayerSP",
     "MixinEntityRenderer",
-    "MixinRenderGlobal",
-    "MixinNetHandlerPlayClient",
     "MixinGuiChest",
     "MixinGuiContainer",
-    "MixinVboRenderList",
-    "MixinRenderList",
-    "MixinEntityPlayer",
-    "MixinTileEntitySpecialRenderer",
-    "MixinRender",
-    "MixinRenderFish",
-    "MixinContainer",
-    "MixinWorld",
-    "MixinPlayerControllerMP",
-    "MixinEffectRenderer",
-    "MixinRendererLivingEntity",
+    "MixinGuiIngame",
+    "MixinGuiInventory",
     "MixinGuiScreen",
-    "MixinTileEntitySkullRenderer",
+    "MixinInventoryEffectRenderer",
+    "MixinInventoryPlayer",
     "MixinItemCameraTransforms",
-    "MixinGuiInventory",
+    "MixinItemRenderer",
+    "MixinItemStack",
     "MixinLayerArmorBase",
-    "MixinTextureManager",
     "MixinLayerCustomHead",
-    "MixinMouseHelper",
-    "MixinAbstractClientPlayer",
-    "MixinInventoryPlayer",
-    "MixinItemRenderer",
-    "MixinEntityPlayerSP",
     "MixinLoadingScreenRenderer",
+    "MixinMouseHelper",
+    "MixinNetHandlerPlayClient",
+    "MixinPlayerControllerMP",
+    "MixinRender",
+    "MixinRendererLivingEntity",
+    "MixinRenderFish",
+    "MixinRenderGlobal",
+    "MixinRenderItem",
+    "MixinRenderList",
+    "MixinTextureManager",
+    "MixinTileEntitySkullRenderer",
+    "MixinTileEntitySpecialRenderer",
+    "MixinVboRenderList",
+    "MixinWorld",
     "MixinWorldClient"
   ]
 }
\ No newline at end of file