aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets
diff options
context:
space:
mode:
authorDoKM <mcazzyman@gmail.com>2021-09-02 14:03:14 +0200
committerDoKM <mcazzyman@gmail.com>2021-09-02 14:03:14 +0200
commit74db72ad590c74b040d0800d411c4e1f1270a09a (patch)
tree8ebf9cdf596fae2ec6b149826475d1d84de9ec3a /src/main/resources/assets
parent05d6207281e18980b8a28046621c741fa81c1606 (diff)
parent8eee6262a6e2c372240331f3c43c2279bd18539e (diff)
downloadNotEnoughUpdates-74db72ad590c74b040d0800d411c4e1f1270a09a.tar.gz
NotEnoughUpdates-74db72ad590c74b040d0800d411c4e1f1270a09a.tar.bz2
NotEnoughUpdates-74db72ad590c74b040d0800d411c4e1f1270a09a.zip
Merge remote-tracking branch 'Moulberry/master'
Diffstat (limited to 'src/main/resources/assets')
-rw-r--r--src/main/resources/assets/notenoughupdates/custom_enchant_gui.pngbin12539 -> 5501 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/nohup.out2
2 files changed, 2 insertions, 0 deletions
diff --git a/src/main/resources/assets/notenoughupdates/custom_enchant_gui.png b/src/main/resources/assets/notenoughupdates/custom_enchant_gui.png
index 0da375a5..06a1fb5d 100644
--- a/src/main/resources/assets/notenoughupdates/custom_enchant_gui.png
+++ b/src/main/resources/assets/notenoughupdates/custom_enchant_gui.png
Binary files differ
diff --git a/src/main/resources/assets/notenoughupdates/nohup.out b/src/main/resources/assets/notenoughupdates/nohup.out
new file mode 100644
index 00000000..14abc1f2
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/nohup.out
@@ -0,0 +1,2 @@
+using gegl copy
+using gegl copy