From 97f7566fa47b4dba67d40ae05ede7936a5c8553a Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Sun, 26 Mar 2017 00:52:18 -0400
Subject: update gloopblocks and technic

---
 gloopblocks/depends.txt                            |   1 +
 gloopblocks/init.lua                               |  28 +++++++++++++++++++--
 .../textures/gloopblocks_rainbow_horizontal.png    | Bin 0 -> 137 bytes
 technic/radiation.lua                              |   3 ++-
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 gloopblocks/textures/gloopblocks_rainbow_horizontal.png

diff --git a/gloopblocks/depends.txt b/gloopblocks/depends.txt
index 8b07d49..cdae19c 100644
--- a/gloopblocks/depends.txt
+++ b/gloopblocks/depends.txt
@@ -9,3 +9,4 @@ wool?
 xdecor?
 caverealms?
 technic?
+nyancat?
diff --git a/gloopblocks/init.lua b/gloopblocks/init.lua
index 5b059eb..48248fc 100644
--- a/gloopblocks/init.lua
+++ b/gloopblocks/init.lua
@@ -17,13 +17,37 @@ end
 
 -- Nodes
 
-minetest.register_node("gloopblocks:rainbow_block", {
-	description = S("Rainbow Block"),
+minetest.register_node("gloopblocks:rainbow_block_diagonal", {
+	description = S("Diagonal Rainbow Block"),
 	tiles = {"gloopblocks_rainbow_block.png"},
 	is_ground_content = true,
 	groups = {cracky=3},
 	sounds = default.node_sound_defaults(),
 })
+minetest.register_alias("gloopblocks:rainbow_block", "gloopblocks:rainbow_block_diagonal")
+
+minetest.register_node("gloopblocks:rainbow_block_horizontal", {
+	description = "Horizontal Rainbow Block",
+	tiles = {
+		"gloopblocks_rainbow_horizontal.png^[transformR90",
+		"gloopblocks_rainbow_horizontal.png^[transformR90",
+		"gloopblocks_rainbow_horizontal.png"
+	},
+	paramtype = "light",
+	light_source = default.LIGHT_MAX,
+	paramtype2 = "facedir",
+	groups = {cracky = 2},
+	is_ground_content = false,
+	sounds = default.node_sound_defaults(),
+})
+
+if not minetest.setting_getbool("pbj_pup_alias_nyancat") then
+	if not minetest.registered_nodes["nyancat:nyancat_rainbow"] then
+		minetest.register_alias("nyancat:nyancat_rainbow", "gloopblocks:rainbow_block_horizontal")
+	elseif not minetest.registered_nodes["default:nyancat_rainbow"] then
+		minetest.register_alias("default:nyancat_rainbow", "gloopblocks:rainbow_block_horizontal")
+	end
+end
 
 minetest.register_node("gloopblocks:cement", {
 	description = S("Cement"),
diff --git a/gloopblocks/textures/gloopblocks_rainbow_horizontal.png b/gloopblocks/textures/gloopblocks_rainbow_horizontal.png
new file mode 100644
index 0000000..685a22c
Binary files /dev/null and b/gloopblocks/textures/gloopblocks_rainbow_horizontal.png differ
diff --git a/technic/radiation.lua b/technic/radiation.lua
index 7bf70da..79dfcb4 100644
--- a/technic/radiation.lua
+++ b/technic/radiation.lua
@@ -56,7 +56,8 @@ local rad_resistance_node = {
 	["default:mossycobble"] = 15,
 	["pbj_pup:pbj_pup"] = 10000,
 	["pbj_pup:pbj_pup_candies"] = 10000,
-	["gloopblocks:rainbow_block"] = 5000,
+	["gloopblocks:rainbow_block_diagonal"] = 5000,
+	["gloopblocks:rainbow_block_horizontal"] = 10000,
 	["default:nyancat"] = 10000,
 	["default:nyancat_rainbow"] = 10000,
 	["nyancat:nyancat"] = 10000,
-- 
cgit v1.2.3