summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@linuxworks.belug.de>2018-03-08 15:24:57 +0100
committerroot <root@linuxworks.belug.de>2018-03-08 15:24:57 +0100
commitc60e5b3c0718aecbace5026d55d59b710a1eee1e (patch)
treea10e6bdc86f7a64cf2e5415c72ab3e1536afa5f4
parentc19005abd5534ab0e3ba2a29f413a36d15cd883e (diff)
parent7e220e3e5a72064ed6f898d2fea618e32c9f8d58 (diff)
Merge https://github.com/h-v-smacker/technic
-rw-r--r--technic/machines/HV/compressor.lua12
-rw-r--r--technic/machines/HV/grinder.lua13
-rw-r--r--technic/machines/HV/init.lua2
-rw-r--r--technic/textures/technic_hv_compressor_bottom.pngbin0 -> 2049 bytes
-rw-r--r--technic/textures/technic_hv_compressor_front.pngbin0 -> 2539 bytes
-rw-r--r--technic/textures/technic_hv_compressor_front_active.pngbin0 -> 2573 bytes
-rw-r--r--technic/textures/technic_hv_compressor_side.pngbin0 -> 2542 bytes
-rw-r--r--technic/textures/technic_hv_compressor_side_tube.pngbin0 -> 2565 bytes
-rw-r--r--technic/textures/technic_hv_compressor_top.pngbin0 -> 2323 bytes
-rw-r--r--technic/textures/technic_hv_electric_furnace_bottom.pngbin422 -> 2049 bytes
-rw-r--r--technic/textures/technic_hv_electric_furnace_front.pngbin590 -> 2527 bytes
-rw-r--r--technic/textures/technic_hv_electric_furnace_front_active.pngbin565 -> 2573 bytes
-rw-r--r--technic/textures/technic_hv_electric_furnace_side.pngbin425 -> 2542 bytes
-rw-r--r--technic/textures/technic_hv_electric_furnace_side_tube.pngbin2444 -> 2565 bytes
-rw-r--r--technic/textures/technic_hv_electric_furnace_top.pngbin1750 -> 2323 bytes
-rw-r--r--technic/textures/technic_hv_grinder_bottom.pngbin862 -> 2049 bytes
-rw-r--r--technic/textures/technic_hv_grinder_front.pngbin716 -> 2639 bytes
-rw-r--r--technic/textures/technic_hv_grinder_front_active.pngbin733 -> 2507 bytes
-rw-r--r--technic/textures/technic_hv_grinder_side.pngbin753 -> 2542 bytes
-rw-r--r--technic/textures/technic_hv_grinder_side_tube.pngbin791 -> 2565 bytes
-rw-r--r--technic/textures/technic_hv_grinder_top.pngbin616 -> 2323 bytes
21 files changed, 27 insertions, 0 deletions
diff --git a/technic/machines/HV/compressor.lua b/technic/machines/HV/compressor.lua
new file mode 100644
index 0000000..12e165b
--- /dev/null
+++ b/technic/machines/HV/compressor.lua
@@ -0,0 +1,12 @@
+-- HV compressor
+
+minetest.register_craft({
+ output = 'technic:hv_compressor',
+ recipe = {
+ {'technic:carbon_plate', 'technic:mv_compressor', 'technic:composite_plate'},
+ {'pipeworks:tube_1', 'technic:hv_transformer', 'pipeworks:tube_1'},
+ {'technic:stainless_steel_ingot', 'technic:hv_cable', 'technic:stainless_steel_ingot'},
+ }
+})
+
+technic.register_compressor({tier = "HV", demand = {1500, 1000, 750}, speed = 5, upgrade = 1, tube = 1})
diff --git a/technic/machines/HV/grinder.lua b/technic/machines/HV/grinder.lua
new file mode 100644
index 0000000..89dfc31
--- /dev/null
+++ b/technic/machines/HV/grinder.lua
@@ -0,0 +1,13 @@
+-- HV grinder
+
+minetest.register_craft({
+ output = 'technic:hv_grinder',
+ recipe = {
+ {'technic:carbon_plate', 'technic:mv_grinder', 'technic:composite_plate'},
+ {'pipeworks:tube_1', 'technic:hv_transformer', 'pipeworks:tube_1'},
+ {'technic:stainless_steel_ingot', 'technic:hv_cable', 'technic:stainless_steel_ingot'},
+ }
+})
+
+technic.register_grinder({tier="HV", demand={1200, 900, 600}, speed=5, upgrade=1, tube=1})
+
diff --git a/technic/machines/HV/init.lua b/technic/machines/HV/init.lua
index 20e256b..93cd7b7 100644
--- a/technic/machines/HV/init.lua
+++ b/technic/machines/HV/init.lua
@@ -16,5 +16,7 @@ dofile(path.."/generator.lua")
dofile(path.."/quarry.lua")
dofile(path.."/forcefield.lua")
dofile(path.."/electric_furnace.lua")
+dofile(path.."/grinder.lua")
+dofile(path.."/compressor.lua")
diff --git a/technic/textures/technic_hv_compressor_bottom.png b/technic/textures/technic_hv_compressor_bottom.png
new file mode 100644
index 0000000..d6a61ed
--- /dev/null
+++ b/technic/textures/technic_hv_compressor_bottom.png
Binary files differ
diff --git a/technic/textures/technic_hv_compressor_front.png b/technic/textures/technic_hv_compressor_front.png
new file mode 100644
index 0000000..4f488a9
--- /dev/null
+++ b/technic/textures/technic_hv_compressor_front.png
Binary files differ
diff --git a/technic/textures/technic_hv_compressor_front_active.png b/technic/textures/technic_hv_compressor_front_active.png
new file mode 100644
index 0000000..60de4f9
--- /dev/null
+++ b/technic/textures/technic_hv_compressor_front_active.png
Binary files differ
diff --git a/technic/textures/technic_hv_compressor_side.png b/technic/textures/technic_hv_compressor_side.png
new file mode 100644
index 0000000..77e2c1f
--- /dev/null
+++ b/technic/textures/technic_hv_compressor_side.png
Binary files differ
diff --git a/technic/textures/technic_hv_compressor_side_tube.png b/technic/textures/technic_hv_compressor_side_tube.png
new file mode 100644
index 0000000..a427128
--- /dev/null
+++ b/technic/textures/technic_hv_compressor_side_tube.png
Binary files differ
diff --git a/technic/textures/technic_hv_compressor_top.png b/technic/textures/technic_hv_compressor_top.png
new file mode 100644
index 0000000..5279c81
--- /dev/null
+++ b/technic/textures/technic_hv_compressor_top.png
Binary files differ
diff --git a/technic/textures/technic_hv_electric_furnace_bottom.png b/technic/textures/technic_hv_electric_furnace_bottom.png
index 3f65026..d6a61ed 100644
--- a/technic/textures/technic_hv_electric_furnace_bottom.png
+++ b/technic/textures/technic_hv_electric_furnace_bottom.png
Binary files differ
diff --git a/technic/textures/technic_hv_electric_furnace_front.png b/technic/textures/technic_hv_electric_furnace_front.png
index 5051cd8..de74673 100644
--- a/technic/textures/technic_hv_electric_furnace_front.png
+++ b/technic/textures/technic_hv_electric_furnace_front.png
Binary files differ
diff --git a/technic/textures/technic_hv_electric_furnace_front_active.png b/technic/textures/technic_hv_electric_furnace_front_active.png
index 76dfbb3..adff958 100644
--- a/technic/textures/technic_hv_electric_furnace_front_active.png
+++ b/technic/textures/technic_hv_electric_furnace_front_active.png
Binary files differ
diff --git a/technic/textures/technic_hv_electric_furnace_side.png b/technic/textures/technic_hv_electric_furnace_side.png
index c30a09e..77e2c1f 100644
--- a/technic/textures/technic_hv_electric_furnace_side.png
+++ b/technic/textures/technic_hv_electric_furnace_side.png
Binary files differ
diff --git a/technic/textures/technic_hv_electric_furnace_side_tube.png b/technic/textures/technic_hv_electric_furnace_side_tube.png
index f94c057..a427128 100644
--- a/technic/textures/technic_hv_electric_furnace_side_tube.png
+++ b/technic/textures/technic_hv_electric_furnace_side_tube.png
Binary files differ
diff --git a/technic/textures/technic_hv_electric_furnace_top.png b/technic/textures/technic_hv_electric_furnace_top.png
index e3d4195..5279c81 100644
--- a/technic/textures/technic_hv_electric_furnace_top.png
+++ b/technic/textures/technic_hv_electric_furnace_top.png
Binary files differ
diff --git a/technic/textures/technic_hv_grinder_bottom.png b/technic/textures/technic_hv_grinder_bottom.png
index fa2c135..9212218 100644
--- a/technic/textures/technic_hv_grinder_bottom.png
+++ b/technic/textures/technic_hv_grinder_bottom.png
Binary files differ
diff --git a/technic/textures/technic_hv_grinder_front.png b/technic/textures/technic_hv_grinder_front.png
index a5bca0a..db9820e 100644
--- a/technic/textures/technic_hv_grinder_front.png
+++ b/technic/textures/technic_hv_grinder_front.png
Binary files differ
diff --git a/technic/textures/technic_hv_grinder_front_active.png b/technic/textures/technic_hv_grinder_front_active.png
index 4077630..4886bc2 100644
--- a/technic/textures/technic_hv_grinder_front_active.png
+++ b/technic/textures/technic_hv_grinder_front_active.png
Binary files differ
diff --git a/technic/textures/technic_hv_grinder_side.png b/technic/textures/technic_hv_grinder_side.png
index c3063c4..26873a2 100644
--- a/technic/textures/technic_hv_grinder_side.png
+++ b/technic/textures/technic_hv_grinder_side.png
Binary files differ
diff --git a/technic/textures/technic_hv_grinder_side_tube.png b/technic/textures/technic_hv_grinder_side_tube.png
index 43bcca5..ac7183d 100644
--- a/technic/textures/technic_hv_grinder_side_tube.png
+++ b/technic/textures/technic_hv_grinder_side_tube.png
Binary files differ
diff --git a/technic/textures/technic_hv_grinder_top.png b/technic/textures/technic_hv_grinder_top.png
index e0df36b..c89511f 100644
--- a/technic/textures/technic_hv_grinder_top.png
+++ b/technic/textures/technic_hv_grinder_top.png
Binary files differ