Merge branch 'beta'1.7-REL1.6-REL

uh yeah its pretty necessary guys

26 files changed, 9 insertions, 0 deletions

diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54.png
new file mode 100644
index 00000000..a8c9eac9
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_button_ctm.png
new file mode 100644
index 00000000..a29a685d
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_button_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_slot_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_slot_ctm.png
new file mode 100644
index 00000000..7eaecfc2
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_slot_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_config.json b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_config.json
new file mode 100644
index 00000000..05dbf61a
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_config.json
@@ -0,0 +1,3 @@
+{
+	"text-colour": "FF000000"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54.png
new file mode 100644
index 00000000..63479a74
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_button_ctm.png
new file mode 100644
index 00000000..4b28ee06
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_button_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_slot_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_slot_ctm.png
new file mode 100644
index 00000000..7eaecfc2
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_slot_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_config.json b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_config.json
new file mode 100644
index 00000000..05dbf61a
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_config.json
@@ -0,0 +1,3 @@
+{
+	"text-colour": "FF000000"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54.png
new file mode 100644
index 00000000..d14f0ed1
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_button_ctm.png
new file mode 100644
index 00000000..800acade
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_button_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_slot_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_slot_ctm.png
new file mode 100644
index 00000000..800acade
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_slot_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_config.json b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_config.json
new file mode 100644
index 00000000..5ae75066
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_config.json
@@ -0,0 +1,3 @@
+{
+	"text-colour": "FFC8C8C8"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54.png
new file mode 100644
index 00000000..934f6b4a
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_button_ctm.png
new file mode 100644
index 00000000..956d085a
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_button_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_slot_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_slot_ctm.png
new file mode 100644
index 00000000..fa43a0ed
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_slot_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54.png
new file mode 100644
index 00000000..73711ee8
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_button_ctm.png
new file mode 100644
index 00000000..bab0eab7
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_button_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_slot_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_slot_ctm.png
new file mode 100644
index 00000000..fa43a0ed
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_slot_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54.png
new file mode 100644
index 00000000..3a24654d
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_button_ctm.png
new file mode 100644
index 00000000..fa43a0ed
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_button_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_slot_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_slot_ctm.png
new file mode 100644
index 00000000..fa43a0ed
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_slot_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54.png
new file mode 100644
index 00000000..934f6b4a
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_button_ctm.png
new file mode 100644
index 00000000..ea57f0d0
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_button_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_slot_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_slot_ctm.png
new file mode 100644
index 00000000..fa43a0ed
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_slot_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/toggle_off.png b/src/main/resources/assets/notenoughupdates/dynamic_54/toggle_off.png
new file mode 100644
index 00000000..7a1aa4a4
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/toggle_off.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/toggle_on.png b/src/main/resources/assets/notenoughupdates/dynamic_54/toggle_on.png
new file mode 100644
index 00000000..5f4960f9
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/toggle_on.png