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

uh yeah its pretty necessary guys

88 files changed, 99 insertions, 0 deletions

diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/1.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/1.json
new file mode 100644
index 00000000..23e86d67
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/1.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 0.25
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/10.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/10.json
new file mode 100644
index 00000000..23e86d67
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/10.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 0.25
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/10.png b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/10.png
new file mode 100644
index 00000000..6cd64ed1
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/10.png
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/11.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/11.json
new file mode 100644
index 00000000..23e86d67
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/11.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 0.25
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/11.png b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/11.png
new file mode 100644
index 00000000..65898e8f
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/11.png
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/2.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/2.json
new file mode 100644
index 00000000..9576ae4f
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/2.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 1
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/2.png b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/2.png
new file mode 100644
index 00000000..6f0daba0
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/2.png
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/3.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/3.json
new file mode 100644
index 00000000..9576ae4f
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/3.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 1
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/3.png b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/3.png
new file mode 100644
index 00000000..4c123e77
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/3.png
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/4.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/4.json
new file mode 100644
index 00000000..9576ae4f
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/4.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 1
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/4.png b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/4.png
new file mode 100644
index 00000000..833b9017
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/4.png
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/5.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/5.json
new file mode 100644
index 00000000..23e86d67
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/5.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 0.25
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/5.png b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/5.png
new file mode 100644
index 00000000..93bef87d
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/5.png
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/6.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/6.json
new file mode 100644
index 00000000..9576ae4f
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/6.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 1
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/6.png b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/6.png
new file mode 100644
index 00000000..43d71ad1
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/6.png
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/7.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/7.json
new file mode 100644
index 00000000..9576ae4f
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/7.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 1
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/7.png b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/7.png
new file mode 100644
index 00000000..054e0e84
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/7.png
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/8.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/8.json
new file mode 100644
index 00000000..b2625fc5
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/8.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 0.21
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/8.png b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/8.png
new file mode 100644
index 00000000..54db6fbc
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/8.png
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/9.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/9.json
new file mode 100644
index 00000000..9576ae4f
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/9.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 1
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/9.png b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/9.png
new file mode 100644
index 00000000..c5fedff9
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/9.png
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/map_border_dragon_stone.png b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/map_border_dragon_stone.png
new file mode 100644
index 00000000..c79eee7f
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/map_border_dragon_stone.png
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/1.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/1.json
new file mode 100644
index 00000000..23e86d67
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/1.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 0.25
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/10.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/10.json
new file mode 100644
index 00000000..23e86d67
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/10.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 0.25
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/10.png b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/10.png
new file mode 100644
index 00000000..4f4b1dc7
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/10.png
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/11.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/11.json
new file mode 100644
index 00000000..23e86d67
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/11.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 0.25
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/11.png b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/11.png
new file mode 100644
index 00000000..3730ab57
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/11.png
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/2.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/2.json
new file mode 100644
index 00000000..9576ae4f
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/2.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 1
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/2.png b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/2.png
new file mode 100644
index 00000000..3627d35e
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/2.png
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/3.json b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/3.json
new file mode 100644
index 00000000..9576ae4f
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/3.json
@@ -0,0 +1,3 @@
+{
+	"radiusSq": 1
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dungeon_map/borders/medium/3.png b/src/main/resources/assets/notenoughupdates/