summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanessa Ezekowitz <vanessaezekowitz@gmail.com>2016-06-03 19:16:56 -0400
committerVanessa Ezekowitz <vanessaezekowitz@gmail.com>2016-06-03 19:27:18 -0400
commit842a6d94916296912aba934b2b23d59244ea463b (patch)
tree20b92c24d2887296a3506c62233534a0e459c426
parentdf2f0076c553c42c5ef4d2d2fbaff58b0ef8e4fd (diff)
downloaddreambuilder_modpack-842a6d94916296912aba934b2b23d59244ea463b.tar
dreambuilder_modpack-842a6d94916296912aba934b2b23d59244ea463b.tar.gz
dreambuilder_modpack-842a6d94916296912aba934b2b23d59244ea463b.tar.bz2
dreambuilder_modpack-842a6d94916296912aba934b2b23d59244ea463b.tar.xz
dreambuilder_modpack-842a6d94916296912aba934b2b23d59244ea463b.zip
update castle, colormachine, moreblocks, pipeworks, tpr, and digilines
-rw-r--r--README.md2
-rw-r--r--castle/screenshot.pngbin1403428 -> 209588 bytes
-rw-r--r--castle/textures/LICENSE.txt39
-rw-r--r--castle/textures/castle_chandelier.pngbin616 -> 360 bytes
-rw-r--r--castle/textures/castle_chandelier_chain.pngbin360 -> 169 bytes
-rw-r--r--castle/textures/castle_chandelier_wield.pngbin511 -> 316 bytes
-rw-r--r--castle/textures/castle_corner_stonewall1.pngbin739 -> 696 bytes
-rw-r--r--castle/textures/castle_corner_stonewall2.pngbin811 -> 682 bytes
-rw-r--r--castle/textures/castle_corner_stonewall_tb.pngbin820 -> 691 bytes
-rw-r--r--castle/textures/castle_crate.pngbin476 -> 344 bytes
-rw-r--r--castle/textures/castle_crate_top.pngbin515 -> 395 bytes
-rw-r--r--castle/textures/castle_ropebox_side_1.pngbin454 -> 342 bytes
-rw-r--r--castle/textures/castle_ropebox_side_2.pngbin515 -> 286 bytes
-rw-r--r--castle/textures/castle_ropebox_top.pngbin515 -> 262 bytes
-rw-r--r--castle/textures/castle_workbench_back.pngbin614 -> 383 bytes
-rw-r--r--castle/textures/castle_workbench_bottom.pngbin509 -> 369 bytes
-rw-r--r--castle/textures/castle_workbench_front.pngbin651 -> 391 bytes
-rw-r--r--castle/textures/castle_workbench_side.pngbin548 -> 342 bytes
-rw-r--r--castle/textures/castle_workbench_top.pngbin698 -> 336 bytes
-rw-r--r--colormachine/init.lua3
-rw-r--r--digilines/LICENSE.txt188
-rw-r--r--digilines/README.inventory (renamed from digilines_inventory/README)0
-rw-r--r--digilines/README.md14
-rw-r--r--digilines/characters (renamed from digilines_lcd/characters)0
-rw-r--r--digilines/description.txt1
-rw-r--r--digilines/init.lua31
-rw-r--r--digilines/inventory.lua (renamed from digilines_inventory/init.lua)10
-rw-r--r--digilines/lcd.lua (renamed from digilines_lcd/init.lua)20
-rw-r--r--digilines/lightsensor.lua (renamed from digilines_lightsensor/init.lua)8
-rw-r--r--digilines/mod.conf1
-rw-r--r--digilines/rtc.lua (renamed from digilines_rtc/init.lua)8
-rw-r--r--digilines/screenshot.pngbin0 -> 25041 bytes
-rw-r--r--digilines/textures/_0.png (renamed from digilines_lcd/textures/_0.png)bin239 -> 239 bytes
-rw-r--r--digilines/textures/_1.png (renamed from digilines_lcd/textures/_1.png)bin238 -> 238 bytes
-rw-r--r--digilines/textures/_2.png (renamed from digilines_lcd/textures/_2.png)bin235 -> 235 bytes
-rw-r--r--digilines/textures/_3.png (renamed from digilines_lcd/textures/_3.png)bin241 -> 241 bytes
-rw-r--r--digilines/textures/_4.png (renamed from digilines_lcd/textures/_4.png)bin240 -> 240 bytes
-rw-r--r--digilines/textures/_5.png (renamed from digilines_lcd/textures/_5.png)bin237 -> 237 bytes
-rw-r--r--digilines/textures/_6.png (renamed from digilines_lcd/textures/_6.png)bin246 -> 246 bytes
-rw-r--r--digilines/textures/_7.png (renamed from digilines_lcd/textures/_7.png)bin243 -> 243 bytes
-rw-r--r--digilines/textures/_8.png (renamed from digilines_lcd/textures/_8.png)bin235 -> 235 bytes
-rw-r--r--digilines/textures/_9.png (renamed from digilines_lcd/textures/_9.png)bin245 -> 245 bytes
-rw-r--r--digilines/textures/_a.png (renamed from digilines_lcd/textures/_a.png)bin238 -> 238 bytes
-rw-r--r--digilines/textures/_a_.png (renamed from digilines_lcd/textures/_a_.png)bin251 -> 251 bytes
-rw-r--r--digilines/textures/_am.png (renamed from digilines_lcd/textures/_am.png)bin156 -> 156 bytes
-rw-r--r--digilines/textures/_ap.png (renamed from digilines_lcd/textures/_ap.png)bin228 -> 228 bytes
-rw-r--r--digilines/textures/_as.png (renamed from digilines_lcd/textures/_as.png)bin238 -> 238 bytes
-rw-r--r--digilines/textures/_at.png (renamed from digilines_lcd/textures/_at.png)bin254 -> 254 bytes
-rw-r--r--digilines/textures/_b.png (renamed from digilines_lcd/textures/_b.png)bin249 -> 249 bytes
-rw-r--r--digilines/textures/_b_.png (renamed from digilines_lcd/textures/_b_.png)bin240 -> 240 bytes
-rw-r--r--digilines/textures/_bl.png (renamed from digilines_lcd/textures/_bl.png)bin237 -> 237 bytes
-rw-r--r--digilines/textures/_br.png (renamed from digilines_lcd/textures/_br.png)bin237 -> 237 bytes
-rw-r--r--digilines/textures/_c.png (renamed from digilines_lcd/textures/_c.png)bin236 -> 236 bytes
-rw-r--r--digilines/textures/_c_.png (renamed from digilines_lcd/textures/_c_.png)bin239 -> 239 bytes
-rw-r--r--digilines/textures/_ca.png (renamed from digilines_lcd/textures/_ca.png)bin231 -> 231 bytes
-rw-r--r--digilines/textures/_cl.png (renamed from digilines_lcd/textures/_cl.png)bin233 -> 233 bytes
-rw-r--r--digilines/textures/_cm.png (renamed from digilines_lcd/textures/_cm.png)bin226 -> 226 bytes
-rw-r--r--digilines/textures/_co.png (renamed from digilines_lcd/textures/_co.png)bin135 -> 135 bytes
-rw-r--r--digilines/textures/_cr.png (renamed from digilines_lcd/textures/_cr.png)bin234 -> 234 bytes
-rw-r--r--digilines/textures/_d.png (renamed from digilines_lcd/textures/_d.png)bin243 -> 243 bytes
-rw-r--r--digilines/textures/_d_.png (renamed from digilines_lcd/textures/_d_.png)bin239 -> 239 bytes
-rw-r--r--digilines/textures/_dl.png (renamed from digilines_lcd/textures/_dl.png)bin239 -> 239 bytes
-rw-r--r--digilines/textures/_dt.png (renamed from digilines_lcd/textures/_dt.png)bin224 -> 224 bytes
-rw-r--r--digilines/textures/_dv.png (renamed from digilines_lcd/textures/_dv.png)bin235 -> 235 bytes
-rw-r--r--digilines/textures/_e.png (renamed from digilines_lcd/textures/_e.png)bin240 -> 240 bytes
-rw-r--r--digilines/textures/_e_.png (renamed from digilines_lcd/textures/_e_.png)bin242 -> 242 bytes
-rw-r--r--digilines/textures/_eq.png (renamed from digilines_lcd/textures/_eq.png)bin228 -> 228 bytes
-rw-r--r--digilines/textures/_ex.png (renamed from digilines_lcd/textures/_ex.png)bin230 -> 230 bytes
-rw-r--r--digilines/textures/_f.png (renamed from digilines_lcd/textures/_f.png)bin244 -> 244 bytes
-rw-r--r--digilines/textures/_f_.png (renamed from digilines_lcd/textures/_f_.png)bin246 -> 246 bytes
-rw-r--r--digilines/textures/_g.png (renamed from digilines_lcd/textures/_g.png)bin251 -> 251 bytes
-rw-r--r--digilines/textures/_g_.png (renamed from digilines_lcd/textures/_g_.png)bin243 -> 243 bytes
-rw-r--r--digilines/textures/_gt.png (renamed from digilines_lcd/textures/_gt.png)bin228 -> 228 bytes
-rw-r--r--digilines/textures/_h.png (renamed from digilines_lcd/textures/_h.png)bin248 -> 248 bytes
-rw-r--r--digilines/textures/_h_.png (renamed from digilines_lcd/textures/_h_.png)bin252 -> 252 bytes
-rw-r--r--digilines/textures/_ha.png (renamed from digilines_lcd/textures/_ha.png)bin233 -> 233 bytes
-rw-r--r--digilines/textures/_hs.png (renamed from digilines_lcd/textures/_hs.png)bin144 -> 144 bytes
-rw-r--r--digilines/textures/_i.png (renamed from digilines_lcd/textures/_i.png)bin237 -> 237 bytes
-rw-r--r--digilines/textures/_i_.png (renamed from digilines_lcd/textures/_i_.png)bin239 -> 239 bytes
-rw-r--r--digilines/textures/_j.png (renamed from digilines_lcd/textures/_j.png)bin240 -> 240 bytes
-rw-r--r--digilines/textures/_j_.png (renamed from digilines_lcd/textures/_j_.png)bin243 -> 243 bytes
-rw-r--r--digilines/textures/_k.png (renamed from digilines_lcd/textures/_k.png)bin247 -> 247 bytes
-rw-r--r--digilines/textures/_k_.png (renamed from digilines_lcd/textures/_k_.png)bin243 -> 243 bytes
-rw-r--r--digilines/textures/_l.png (renamed from digilines_lcd/textures/_l.png)bin238 -> 238 bytes
-rw-r--r--digilines/textures/_l_.png (renamed from digilines_lcd/textures/_l_.png)bin242 -> 242 bytes
-rw-r--r--digilines/textures/_lt.png (renamed from digilines_lcd/textures/_lt.png)bin227 -> 227 bytes
-rw-r--r--digilines/textures/_m.png (renamed from digilines_lcd/textures/_m.png)bin240 -> 240 bytes
-rw-r--r--digilines/textures/_m_.png (renamed from digilines_lcd/textures/_m_.png)bin244 -> 244 bytes
-rw-r--r--digilines/textures/_mn.png (renamed from digilines_lcd/textures/_mn.png)bin228 -> 228 bytes
-rw-r--r--digilines/textures/_n.png (renamed from digilines_lcd/textures/_n.png)bin248 -> 248 bytes
-rw-r--r--digilines/textures/_n_.png (renamed from digilines_lcd/textures/_n_.png)bin252 -> 252 bytes
-rw-r--r--digilines/textures/_o.png (renamed from digilines_lcd/textures/_o.png)bin238 -> 238 bytes
-rw-r--r--digilines/textures/_o_.png (renamed from digilines_lcd/textures/_o_.png)bin239 -> 239 bytes
-rw-r--r--digilines/textures/_p.png (renamed from digilines_lcd/textures/_p.png)bin250 -> 250 bytes
-rw-r--r--digilines/textures/_p_.png (renamed from digilines_lcd/textures/_p_.png)bin246 -> 246 bytes
-rw-r--r--digilines/textures/_pr.png (renamed from digilines_lcd/textures/_pr.png)bin255 -> 255 bytes
-rw-r--r--digilines/textures/_ps.png (renamed from digilines_lcd/textures/_ps.png)bin235 -> 235 bytes
-rw-r--r--digilines/textures/_q.png (renamed from digilines_lcd/textures/_q.png)bin251 -> 251 bytes
-rw-r--r--digilines/textures/_q_.png (renamed from digilines_lcd/textures/_q_.png)bin242 -> 242 bytes
-rw-r--r--digilines/textures/_qo.png (renamed from digilines_lcd/textures/_qo.png)bin232 -> 232 bytes
-rw-r--r--digilines/textures/_qu.png (renamed from digilines_lcd/textures/_qu.png)bin233 -> 233 bytes
-rw-r--r--digilines/textures/_r.png (renamed from digilines_lcd/textures/_r.png)bin241 -> 241 bytes
-rw-r--r--digilines/textures/_r_.png (renamed from digilines_lcd/textures/_r_.png)bin248 -> 248 bytes
-rw-r--r--digilines/textures/_re.png (renamed from digilines_lcd/textures/_re.png)bin243 -> 243 bytes
-rw-r--r--digilines/textures/_s.png (renamed from digilines_lcd/textures/_s.png)bin239 -> 239 bytes
-rw-r--r--digilines/textures/_s_.png (renamed from digilines_lcd/textures/_s_.png)bin243 -> 243 bytes
-rw-r--r--digilines/textures/_sl.png (renamed from digilines_lcd/textures/_sl.png)bin240 -> 240 bytes
-rw-r--r--digilines/textures/_sm.png (renamed from digilines_lcd/textures/_sm.png)bin227 -> 227 bytes
-rw-r--r--digilines/textures/_sp.png (renamed from digilines_lcd/textures/_sp.png)bin215 -> 215 bytes
-rw-r--r--digilines/textures/_sr.png (renamed from digilines_lcd/textures/_sr.png)bin236 -> 236 bytes
-rw-r--r--digilines/textures/_t.png (renamed from digilines_lcd/textures/_t.png)bin241 -> 241 bytes
-rw-r--r--digilines/textures/_t_.png (renamed from digilines_lcd/textures/_t_.png)bin249 -> 249 bytes
-rw-r--r--digilines/textures/_tl.png (renamed from digilines_lcd/textures/_tl.png)bin227 -> 227 bytes
-rw-r--r--digilines/textures/_u.png (renamed from digilines_lcd/textures/_u.png)bin240 -> 240 bytes
-rw-r--r--digilines/textures/_u_.png (renamed from digilines_lcd/textures/_u_.png)bin252 -> 252 bytes
-rw-r--r--digilines/textures/_un.png (renamed from digilines_lcd/textures/_un.png)bin226 -> 226 bytes
-rw-r--r--digilines/textures/_v.png (renamed from digilines_lcd/textures/_v.png)bin249 -> 249 bytes
-rw-r--r--digilines/textures/_v_.png (renamed from digilines_lcd/textures/_v_.png)bin246 -> 246 bytes
-rw-r--r--digilines/textures/_vb.png (renamed from digilines_lcd/textures/_vb.png)bin229 -> 229 bytes
-rw-r--r--digilines/textures/_w.png (renamed from digilines_lcd/textures/_w.png)bin238 -> 238 bytes
-rw-r--r--digilines/textures/_w_.png (renamed from digilines_lcd/textures/_w_.png)bin247 -> 247 bytes
-rw-r--r--digilines/textures/_x.png (renamed from digilines_lcd/textures/_x.png)bin241 -> 241 bytes
-rw-r--r--digilines/textures/_x_.png (renamed from digilines_lcd/textures/_x_.png)bin246 -> 246 bytes
-rw-r--r--digilines/textures/_y.png (renamed from digilines_lcd/textures/_y.png)bin246 -> 246 bytes
-rw-r--r--digilines/textures/_y_.png (renamed from digilines_lcd/textures/_y_.png)bin243 -> 243 bytes
-rw-r--r--digilines/textures/_z.png (renamed from digilines_lcd/textures/_z.png)bin233 -> 233 bytes
-rw-r--r--digilines/textures/_z_.png (renamed from digilines_lcd/textures/_z_.png)bin235 -> 235 bytes
-rw-r--r--digilines/textures/digilines_lightsensor.png (renamed from digilines_lightsensor/textures/digilines_lightsensor.png)bin218 -> 218 bytes
-rw-r--r--digilines/textures/digilines_rtc.png (renamed from digilines_rtc/textures/digilines_rtc.png)bin248 -> 248 bytes
-rw-r--r--digilines/textures/lcd_anyside.png (renamed from digilines_lcd/textures/lcd_anyside.png)bin142 -> 142 bytes
-rw-r--r--digilines/textures/lcd_lcd.png (renamed from digilines_lcd/textures/lcd_lcd.png)bin189 -> 189 bytes
-rw-r--r--digilines_inventory/depends.txt1
-rw-r--r--digilines_lightsensor/depends.txt1
-rw-r--r--digilines_rtc/depends.txt1
-rw-r--r--moreblocks/README.md2
-rw-r--r--pipeworks/init.lua8
-rw-r--r--teleport_request/README.md12
-rw-r--r--teleport_request/init.lua2
138 files changed, 314 insertions, 38 deletions
diff --git a/README.md b/README.md
index 1e4088e..330415e 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-# dreambuilder_modpack
+dreambuilder_modpack
diff --git a/castle/screenshot.png b/castle/screenshot.png
index 3848fb2..60175ee 100644
--- a/castle/screenshot.png
+++ b/castle/screenshot.png
Binary files differ
diff --git a/castle/textures/LICENSE.txt b/castle/textures/LICENSE.txt
index 7752294..ce99ae2 100644
--- a/castle/textures/LICENSE.txt
+++ b/castle/textures/LICENSE.txt
@@ -9,25 +9,42 @@ Licence Models: Stuart Jones - CC-BY-SA 3.0
-castle_crossbow_bolt.b3d
-castle_crossbow_bolt.blend
+
--------------------------------------------
-textures based on Castle mod
-original textures by Philipner ???
+License Textures: Kilbith - WTFPL
+
+-castle_tapestry_overlay.png
-License Textures: CC-BY-SA 3.0 ???
--------------------------------------------
-License Textures: Napiophelios - CC-BY-SA 3.0
+License Textures: Philipner - CC-BY-SA 3.0
--castle_battleaxe.png
+-castle_chandelier.png
+-castle_chandelier_chain.png
+-castle_chandelier_wield.png
+-castle_corner_stonewall_tb.png
-castle_corner_stonewall1.png
-castle_corner_stonewall2.png
--castle_crate.png
--castle_crate_top.png
+-castle_orb_day.png
+-castle_orb_night.png
+-castle_workbench_back.png
+-castle_workbench_front.png
+-castle_workbench_side.png
+-castle_workbench_top.png
+
+
+--------------------------------------------
+
+16 px textures based on Castle mod
+original textures by Philipner
+
+License Textures: Napiophelios - CC-BY-SA 3.0
+
+-castle_battleaxe.png
-castle_crossbow_bolt_inv.png
-castle_crossbow_hit.png
--castle_crossbow_inv.png
-castle_crossbow_loaded.png
-castle_door_jail.png
-castle_door_oak.png
@@ -62,10 +79,6 @@ License Textures: Napiophelios - CC-BY-SA 3.0
-castle_stonewall.png
-castle_straw_bale.png
-castle_street_light.png
--castle_workbench_1.png
--castle_workbench_2.png
-castle_workbench_bottom.png
--castle_workbench_top.png
-
--------------------------------------------- \ No newline at end of file
+--------------------------------------------
diff --git a/castle/textures/castle_chandelier.png b/castle/textures/castle_chandelier.png
index 7396d83..fbc0039 100644
--- a/castle/textures/castle_chandelier.png
+++ b/castle/textures/castle_chandelier.png
Binary files differ
diff --git a/castle/textures/castle_chandelier_chain.png b/castle/textures/castle_chandelier_chain.png
index b220586..47a526a 100644
--- a/castle/textures/castle_chandelier_chain.png
+++ b/castle/textures/castle_chandelier_chain.png
Binary files differ
diff --git a/castle/textures/castle_chandelier_wield.png b/castle/textures/castle_chandelier_wield.png
index 6caaed1..59dae96 100644
--- a/castle/textures/castle_chandelier_wield.png
+++ b/castle/textures/castle_chandelier_wield.png
Binary files differ
diff --git a/castle/textures/castle_corner_stonewall1.png b/castle/textures/castle_corner_stonewall1.png
index bed68b9..0a9c091 100644
--- a/castle/textures/castle_corner_stonewall1.png
+++ b/castle/textures/castle_corner_stonewall1.png
Binary files differ
diff --git a/castle/textures/castle_corner_stonewall2.png b/castle/textures/castle_corner_stonewall2.png
index 1f97dfc..d9d7d0c 100644
--- a/castle/textures/castle_corner_stonewall2.png
+++ b/castle/textures/castle_corner_stonewall2.png
Binary files differ
diff --git a/castle/textures/castle_corner_stonewall_tb.png b/castle/textures/castle_corner_stonewall_tb.png
index 8171a98..d72d78d 100644
--- a/castle/textures/castle_corner_stonewall_tb.png
+++ b/castle/textures/castle_corner_stonewall_tb.png
Binary files differ
diff --git a/castle/textures/castle_crate.png b/castle/textures/castle_crate.png
index edbd0bc..33669e8 100644
--- a/castle/textures/castle_crate.png
+++ b/castle/textures/castle_crate.png
Binary files differ
diff --git a/castle/textures/castle_crate_top.png b/castle/textures/castle_crate_top.png
index 7910d82..89d65a2 100644
--- a/castle/textures/castle_crate_top.png
+++ b/castle/textures/castle_crate_top.png
Binary files differ
diff --git a/castle/textures/castle_ropebox_side_1.png b/castle/textures/castle_ropebox_side_1.png
index a747750..00902d7 100644
--- a/castle/textures/castle_ropebox_side_1.png
+++ b/castle/textures/castle_ropebox_side_1.png
Binary files differ
diff --git a/castle/textures/castle_ropebox_side_2.png b/castle/textures/castle_ropebox_side_2.png
index ec8b9ab..6340191 100644
--- a/castle/textures/castle_ropebox_side_2.png
+++ b/castle/textures/castle_ropebox_side_2.png
Binary files differ
diff --git a/castle/textures/castle_ropebox_top.png b/castle/textures/castle_ropebox_top.png
index ec8b9ab..0b9115b 100644
--- a/castle/textures/castle_ropebox_top.png
+++ b/castle/textures/castle_ropebox_top.png
Binary files differ
diff --git a/castle/textures/castle_workbench_back.png b/castle/textures/castle_workbench_back.png
index 26d17f1..174d941 100644
--- a/castle/textures/castle_workbench_back.png
+++ b/castle/textures/castle_workbench_back.png
Binary files differ
diff --git a/castle/textures/castle_workbench_bottom.png b/castle/textures/castle_workbench_bottom.png
index f6c43f4..f50a8f3 100644
--- a/castle/textures/castle_workbench_bottom.png
+++ b/castle/textures/castle_workbench_bottom.png
Binary files differ
diff --git a/castle/textures/castle_workbench_front.png b/castle/textures/castle_workbench_front.png
index aefa84a..27a1f1f 100644
--- a/castle/textures/castle_workbench_front.png
+++ b/castle/textures/castle_workbench_front.png
Binary files differ
diff --git a/castle/textures/castle_workbench_side.png b/castle/textures/castle_workbench_side.png
index 461be85..b6418ac 100644
--- a/castle/textures/castle_workbench_side.png
+++ b/castle/textures/castle_workbench_side.png
Binary files differ
diff --git a/castle/textures/castle_workbench_top.png b/castle/textures/castle_workbench_top.png
index 1e12954..fef4827 100644
--- a/castle/textures/castle_workbench_top.png
+++ b/castle/textures/castle_workbench_top.png
Binary files differ
diff --git a/colormachine/init.lua b/colormachine/init.lua
index 912be13..dceff54 100644
--- a/colormachine/init.lua
+++ b/colormachine/init.lua
@@ -1139,6 +1139,9 @@ colormachine.blocktype_menu = function( meta, new_color, page )
local per_line = 13;
local anz_lines = 3;
local per_page = anz_lines * per_line;
+ if( not( page )) then
+ page = 1;
+ end
local start_at_offset = per_page * page;
new_color = colormachine.decode_color_name( meta, new_color );
diff --git a/digilines/LICENSE.txt b/digilines/LICENSE.txt
new file mode 100644
index 0000000..9569df7
--- /dev/null
+++ b/digilines/LICENSE.txt
@@ -0,0 +1,188 @@
+The LGPLv3 applies to all code in this project.
+The WTFPL applies to textures and any other content in this project which is not source code.
+
+=============================================================
+
+GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+
+=============================================================
+
+
+ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. You just DO WHAT THE FUCK YOU WANT TO.
diff --git a/digilines_inventory/README b/digilines/README.inventory
index a88115f..a88115f 100644
--- a/digilines_inventory/README
+++ b/digilines/README.inventory
diff --git a/digilines/README.md b/digilines/README.md
new file mode 100644
index 0000000..3d57f52
--- /dev/null
+++ b/digilines/README.md
@@ -0,0 +1,14 @@
+Digilines
+==========
+- The minetest counterpart for bus systems like i2c, SPI, RS232, USB -
+
+
+This mod adds digiline wires, an RTC (Real Time Clock), a light sensor as well as an LCD Screen.
+Can be used together with the luacontroller from mesecons. See the luacontroller manual for more information.
+
+Send "GET" to RTC or light sensor to retrieve Data, send any text to LCD to display it.
+Select channel by right-clicking items.
+
+License:
+ Code: LGPL
+ Textures: WTFPL
diff --git a/digilines_lcd/characters b/digilines/characters
index b36eea4..b36eea4 100644
--- a/digilines_lcd/characters
+++ b/digilines/characters
diff --git a/digilines/description.txt b/digilines/description.txt
new file mode 100644
index 0000000..078bc92
--- /dev/null
+++ b/digilines/description.txt
@@ -0,0 +1 @@
+This mod adds digiline wires, an RTC (Real Time Clock), a light sensor as well as an LCD Screen. Can be used together with the luacontroller from mesecons.
diff --git a/digilines/init.lua b/digilines/init.lua
index 92f916d..2f48a73 100644
--- a/digilines/init.lua
+++ b/digilines/init.lua
@@ -1,9 +1,11 @@
digiline = {}
-dofile(minetest.get_modpath("digilines").."/presetrules.lua")
-dofile(minetest.get_modpath("digilines").."/util.lua")
-dofile(minetest.get_modpath("digilines").."/internal.lua")
-dofile(minetest.get_modpath("digilines").."/wires_common.lua")
-dofile(minetest.get_modpath("digilines").."/wire_std.lua")
+
+local modpath = minetest.get_modpath("digilines")
+dofile(modpath .. "/presetrules.lua")
+dofile(modpath .. "/util.lua")
+dofile(modpath .. "/internal.lua")
+dofile(modpath .. "/wires_common.lua")
+dofile(modpath .. "/wire_std.lua")
function digiline:receptor_send(pos, rules, channel, msg)
local checked = {}
@@ -22,4 +24,21 @@ minetest.register_craft({
{'mesecons_insulated:insulated_off', 'mesecons_insulated:insulated_off', 'default:gold_ingot'},
{'mesecons_materials:fiber', 'mesecons_materials:fiber', 'mesecons_materials:fiber'},
}
-}) \ No newline at end of file
+})
+
+-- former submods
+if minetest.is_yes(minetest.setting_get("digilines_enable_inventory") or true) then
+ dofile(modpath .. "/inventory.lua")
+end
+
+if minetest.is_yes(minetest.setting_get("digilines_enable_lcd") or true) then
+ dofile(modpath .. "/lcd.lua")
+end
+
+if minetest.is_yes(minetest.setting_get("digilines_enable_lightsensor") or true) then
+ dofile(modpath .. "/lightsensor.lua")
+end
+
+if minetest.is_yes(minetest.setting_get("digilines_enable_rtc") or true) then
+ dofile(modpath .. "/rtc.lua")
+end
diff --git a/digilines_inventory/init.lua b/digilines/inventory.lua
index a8e7ecf..0134e5c 100644
--- a/digilines_inventory/init.lua
+++ b/digilines/inventory.lua
@@ -26,7 +26,8 @@ end
local tubeconn = minetest.get_modpath("pipeworks") and "^pipeworks_tube_connection_wooden.png" or ""
local tubescan = minetest.get_modpath("pipeworks") and function(pos) pipeworks.scan_for_tube_objects(pos) end or nil
-minetest.register_node("digilines_inventory:chest", {
+minetest.register_alias("digilines_inventory:chest", "digilines:chest")
+minetest.register_node("digilines:chest", {
description = "Digiline Chest",
tiles = {
"default_chest_top.png"..tubeconn,
@@ -61,6 +62,11 @@ minetest.register_node("digilines_inventory:chest", {
return minetest.get_meta(pos):get_inventory():is_empty("main")
end,
on_receive_fields = function(pos, formname, fields, sender)
+ local name = sender:get_player_name()
+ if minetest.is_protected(pos, name) and not minetest.check_player_privs(name, {protection_bypass=true}) then
+ minetest.record_protection_violation(pos, name)
+ return
+ end
if fields.channel ~= nil then
minetest.get_meta(pos):set_string("channel",fields.channel)
end
@@ -140,6 +146,6 @@ minetest.register_node("digilines_inventory:chest", {
minetest.register_craft({
type = "shapeless",
- output = "digilines_inventory:chest",
+ output = "digilines:chest",
recipe = {"default:chest", "digilines:wire_std_00000000"}
})
diff --git a/digilines_lcd/init.lua b/digilines/lcd.lua
index ade3fca..3370a31 100644
--- a/digilines_lcd/init.lua
+++ b/digilines/lcd.lua
@@ -3,11 +3,11 @@
-- Font: 04.jp.org
-- load characters map
-local chars_file = io.open(minetest.get_modpath("digilines_lcd").."/characters", "r")
+local chars_file = io.open(minetest.get_modpath("digilines").."/characters", "r")
local charmap = {}
local max_chars = 12
if not chars_file then
- print("[digilines_lcd] E: character map file not found")
+ print("[digilines] E: LCD: character map file not found")
else
while true do
local char = chars_file:read("*l")
@@ -76,7 +76,8 @@ local lcd_box = {
wall_top = {-8/16, 7/16, -8/16, 8/16, 8/16, 8/16}
}
-minetest.register_node("digilines_lcd:lcd", {
+minetest.register_alias("digilines_lcd:lcd", "digilines:lcd")
+minetest.register_node("digilines:lcd", {
drawtype = "nodebox",
description = "Digiline LCD",
inventory_image = "lcd_lcd.png",
@@ -93,7 +94,7 @@ minetest.register_node("digilines_lcd:lcd", {
after_place_node = function (pos, placer, itemstack)
local param2 = minetest.get_node(pos).param2
if param2 == 0 or param2 == 1 then
- minetest.add_node(pos, {name = "digilines_lcd:lcd", param2 = 3})
+ minetest.add_node(pos, {name = "digilines:lcd", param2 = 3})
end
prepare_writing (pos)
end,
@@ -107,6 +108,11 @@ minetest.register_node("digilines_lcd:lcd", {
end,
on_receive_fields = function(pos, formname, fields, sender)
+ local name = sender:get_player_name()
+ if minetest.is_protected(pos, name) and not minetest.check_player_privs(name, {protection_bypass=true}) then
+ minetest.record_protection_violation(pos, name)
+ return
+ end
if (fields.channel) then
minetest.get_meta(pos):set_string("channel", fields.channel)
end
@@ -123,7 +129,7 @@ minetest.register_node("digilines_lcd:lcd", {
light_source = 6,
})
-minetest.register_entity("digilines_lcd:text", {
+minetest.register_entity(":digilines_lcd:text", {
collisionbox = { 0, 0, 0, 0, 0, 0 },
visual = "upright_sprite",
textures = {},
@@ -197,7 +203,7 @@ generate_line = function(s, ypos)
file = charmap[s:sub(i, i + 1)]
i = i + 2
else
- print("[digilines_lcd] W: unknown symbol in '"..s.."' at "..i)
+ print("[digilines] W: LCD: unknown symbol in '"..s.."' at "..i)
i = i + 1
end
if file ~= nil then
@@ -218,7 +224,7 @@ generate_line = function(s, ypos)
end
minetest.register_craft({
- output = "digilines_lcd:lcd 2",
+ output = "digilines:lcd 2",
recipe = {
{"default:steel_ingot", "digilines:wire_std_00000000", "default:steel_ingot"},
{"mesecons_lightstone:lightstone_green_off","mesecons_lightstone:lightstone_green_off","mesecons_lightstone:lightstone_green_off"},
diff --git a/digilines_lightsensor/init.lua b/digilines/lightsensor.lua
index 7dda1ce..86a29c9 100644
--- a/digilines_lightsensor/init.lua
+++ b/digilines/lightsensor.lua
@@ -29,7 +29,8 @@ local on_digiline_receive = function (pos, node, channel, msg)
end
end
-minetest.register_node("digilines_lightsensor:lightsensor", {
+minetest.register_alias("digilines_lightsensor:lightsensor", "digilines:lightsensor")
+minetest.register_node("digilines:lightsensor", {
description = "Digiline Lightsensor",
drawtype = "nodebox",
tiles = {"digilines_lightsensor.png"},
@@ -50,6 +51,11 @@ minetest.register_node("digilines_lightsensor:lightsensor", {
meta:set_string("formspec", "field[channel;Channel;${channel}]")
end,
on_receive_fields = function(pos, formname, fields, sender)
+ local name = sender:get_player_name()
+ if minetest.is_protected(pos, name) and not minetest.check_player_privs(name, {protection_bypass=true}) then
+ minetest.record_protection_violation(pos, name)
+ return
+ end
if (fields.channel) then
minetest.get_meta(pos):set_string("channel", fields.channel)
end
diff --git a/digilines/mod.conf b/digilines/mod.conf
new file mode 100644
index 0000000..0b01ac5
--- /dev/null
+++ b/digilines/mod.conf
@@ -0,0 +1 @@
+name = digilines
diff --git a/digilines_rtc/init.lua b/digilines/rtc.lua
index 6b7bfaf..f8f6af4 100644
--- a/digilines_rtc/init.lua
+++ b/digilines/rtc.lua
@@ -24,7 +24,8 @@ local on_digiline_receive = function (pos, node, channel, msg)
end
end
-minetest.register_node("digilines_rtc:rtc", {
+minetest.register_alias("digilines_rtc:rtc", "digilines:rtc")
+minetest.register_node("digilines:rtc", {
description = "Digiline Real Time Clock (RTC)",
drawtype = "nodebox",
tiles = {"digilines_rtc.png"},
@@ -46,6 +47,11 @@ minetest.register_node("digilines_rtc:rtc", {
meta:set_string("formspec", "field[channel;Channel;${channel}]")
end,
on_receive_fields = function(pos, formname, fields, sender)
+ local name = sender:get_player_name()
+ if minetest.is_protected(pos, name) and not minetest.check_player_privs(name, {protection_bypass=true}) then
+ minetest.record_protection_violation(pos, name)
+ return
+ end
if (fields.channel) then
minetest.get_meta(pos):set_string("channel", fields.channel)
end
diff --git a/digilines/screenshot.png b/digilines/screenshot.png
new file mode 100644
index 0000000..e699cea
--- /dev/null
+++ b/digilines/screenshot.png
Binary files differ
diff --git a/digilines_lcd/textures/_0.png b/digilines/textures/_0.png
index b030879..b030879 100644
--- a/digilines_lcd/textures/_0.png
+++ b/digilines/textures/_0.png
Binary files differ
diff --git a/digilines_lcd/textures/_1.png b/digilines/textures/_1.png
index ae28369..ae28369 100644
--- a/digilines_lcd/textures/_1.png
+++ b/digilines/textures/_1.png
Binary files differ
diff --git a/digilines_lcd/textures/_2.png b/digilines/textures/_2.png
index 7375c68..7375c68 100644
--- a/digilines_lcd/textures/_2.png
+++ b/digilines/textures/_2.png
Binary files differ
diff --git a/digilines_lcd/textures/_3.png b/digilines/textures/_3.png
index d724811..d724811 100644
--- a/digilines_lcd/textures/_3.png
+++ b/digilines/textures/_3.png
Binary files differ
diff --git a/digilines_lcd/textures/_4.png b/digilines/textures/_4.png
index 0fff433..0fff433 100644
--- a/digilines_lcd/textures/_4.png
+++ b/digilines/textures/_4.png
Binary files differ
diff --git a/digilines_lcd/textures/_5.png b/digilines/textures/_5.png
index 43010df..43010df 100644
--- a/digilines_lcd/textures/_5.png
+++ b/digilines/textures/_5.png
Binary files differ
diff --git a/digilines_lcd/textures/_6.png b/digilines/textures/_6.png
index 1eba38c..1eba38c 100644
--- a/digilines_lcd/textures/_6.png
+++ b/digilines/textures/_6.png
Binary files differ
diff --git a/digilines_lcd/textures/_7.png b/digilines/textures/_7.png
index dbcd2d1..dbcd2d1 100644
--- a/digilines_lcd/textures/_7.png
+++ b/digilines/textures/_7.png
Binary files differ
diff --git a/digilines_lcd/textures/_8.png b/digilines/textures/_8.png
index edf6ef5..edf6ef5 100644
--- a/digilines_lcd/textures/_8.png
+++ b/digilines/textures/_8.png
Binary files differ
diff --git a/digilines_lcd/textures/_9.png b/digilines/textures/_9.png
index c276c11..c276c11 100644
--- a/digilines_lcd/textures/_9.png
+++ b/digilines/textures/_9.png
Binary files differ
diff --git a/digilines_lcd/textures/_a.png b/digilines/textures/_a.png
index 8f3f59c..8f3f59c 100644
--- a/digilines_lcd/textures/_a.png
+++ b/digilines/textures/_a.png
Binary files differ
diff --git a/digilines_lcd/textures/_a_.png b/digilines/textures/_a_.png
index 4da193c..4da193c 100644
--- a/digilines_lcd/textures/_a_.png
+++ b/digilines/textures/_a_.png
Binary files differ
diff --git a/digilines_lcd/textures/_am.png b/digilines/textures/_am.png
index 75d0287..75d0287 100644
--- a/digilines_lcd/textures/_am.png
+++ b/digilines/textures/_am.png
Binary files differ
diff --git a/digilines_lcd/textures/_ap.png b/digilines/textures/_ap.png
index 5dd3325..5dd3325 100644
--- a/digilines_lcd/textures/_ap.png
+++ b/digilines/textures/_ap.png
Binary files differ
diff --git a/digilines_lcd/textures/_as.png b/digilines/textures/_as.png
index 3c7a25a..3c7a25a 100644
--- a/digilines_lcd/textures/_as.png
+++ b/digilines/textures/_as.png
Binary files differ
diff --git a/digilines_lcd/textures/_at.png b/digilines/textures/_at.png
index 4f9841c..4f9841c 100644
--- a/digilines_lcd/textures/_at.png
+++ b/digilines/textures/_at.png
Binary files differ
diff --git a/digilines_lcd/textures/_b.png b/digilines/textures/_b.png
index baf4eaa..baf4eaa 100644
--- a/digilines_lcd/textures/_b.png
+++ b/digilines/textures/_b.png
Binary files differ
diff --git a/digilines_lcd/textures/_b_.png b/digilines/textures/_b_.png
index b00a378..b00a378 100644
--- a/digilines_lcd/textures/_b_.png
+++ b/digilines/textures/_b_.png
Binary files differ
diff --git a/digilines_lcd/textures/_bl.png b/digilines/textures/_bl.png
index 546ca4e..546ca4e 100644
--- a/digilines_lcd/textures/_bl.png
+++ b/digilines/textures/_bl.png
Binary files differ
diff --git a/digilines_lcd/textures/_br.png b/digilines/textures/_br.png
index 5700fa6..5700fa6 100644
--- a/digilines_lcd/textures/_br.png
+++ b/digilines/textures/_br.png
Binary files differ
diff --git a/digilines_lcd/textures/_c.png b/digilines/textures/_c.png
index eedd639..eedd639 100644
--- a/digilines_lcd/textures/_c.png
+++ b/digilines/textures/_c.png
Binary files differ
diff --git a/digilines_lcd/textures/_c_.png b/digilines/textures/_c_.png
index cab6518..cab6518 100644
--- a/digilines_lcd/textures/_c_.png
+++ b/digilines/textures/_c_.png
Binary files differ
diff --git a/digilines_lcd/textures/_ca.png b/digilines/textures/_ca.png
index d359c88..d359c88 100644
--- a/digilines_lcd/textures/_ca.png
+++ b/digilines/textures/_ca.png
Binary files differ
diff --git a/digilines_lcd/textures/_cl.png b/digilines/textures/_cl.png
index 55396b9..55396b9 100644
--- a/digilines_lcd/textures/_cl.png
+++ b/digilines/textures/_cl.png
Binary files differ
diff --git a/digilines_lcd/textures/_cm.png b/digilines/textures/_cm.png
index 28beedf..28beedf 100644
--- a/digilines_lcd/textures/_cm.png
+++ b/digilines/textures/_cm.png
Binary files differ
diff --git a/digilines_lcd/textures/_co.png b/digilines/textures/_co.png
index b161819..b161819 100644
--- a/digilines_lcd/textures/_co.png
+++ b/digilines/textures/_co.png
Binary files differ
diff --git a/digilines_lcd/textures/_cr.png b/digilines/textures/_cr.png
index ac466a9..ac466a9 100644
--- a/digilines_lcd/textures/_cr.png
+++ b/digilines/textures/_cr.png
Binary files differ
diff --git a/digilines_lcd/textures/_d.png b/digilines/textures/_d.png
index a5f0699..a5f0699 100644
--- a/digilines_lcd/textures/_d.png
+++ b/digilines/textures/_d.png
Binary files differ
diff --git a/digilines_lcd/textures/_d_.png b/digilines/textures/_d_.png
index 9a0e3ed..9a0e3ed 100644
--- a/digilines_lcd/textures/_d_.png
+++ b/digilines/textures/_d_.png
Binary files differ
diff --git a/digilines_lcd/textures/_dl.png b/digilines/textures/_dl.png
index 72184ad..72184ad 100644
--- a/digilines_lcd/textures/_dl.png
+++ b/digilines/textures/_dl.png
Binary files differ
diff --git a/digilines_lcd/textures/_dt.png b/digilines/textures/_dt.png
index 61c1e4a..61c1e4a 100644
--- a/digilines_lcd/textures/_dt.png
+++ b/digilines/textures/_dt.png
Binary files differ
diff --git a/digilines_lcd/textures/_dv.png b/digilines/textures/_dv.png
index 996d7cd..996d7cd 100644
--- a/digilines_lcd/textures/_dv.png
+++ b/digilines/textures/_dv.png
Binary files differ
diff --git a/digilines_lcd/textures/_e.png b/digilines/textures/_e.png
index 29e32e6..29e32e6 100644
--- a/digilines_lcd/textures/_e.png
+++ b/digilines/textures/_e.png
Binary files differ
diff --git a/digilines_lcd/textures/_e_.png b/digilines/textures/_e_.png
index c7f19c1..c7f19c1 100644
--- a/digilines_lcd/textures/_e_.png
+++ b/digilines/textures/_e_.png
Binary files differ
diff --git a/digilines_lcd/textures/_eq.png b/digilines/textures/_eq.png
index daf8424..daf8424 100644
--- a/digilines_lcd/textures/_eq.png
+++ b/digilines/textures/_eq.png
Binary files differ
diff --git a/digilines_lcd/textures/_ex.png b/digilines/textures/_ex.png
index b5da8e9..b5da8e9 100644
--- a/digilines_lcd/textures/_ex.png
+++ b/digilines/textures/_ex.png
Binary files differ
diff --git a/digilines_lcd/textures/_f.png b/digilines/textures/_f.png
index 6835912..6835912 100644
--- a/digilines_lcd/textures/_f.png
+++ b/digilines/textures/_f.png
Binary files differ
diff --git a/digilines_lcd/textures/_f_.png b/digilines/textures/_f_.png
index 3698ed2..3698ed2 100644
--- a/digilines_lcd/textures/_f_.png
+++ b/digilines/textures/_f_.png
Binary files differ
diff --git a/digilines_lcd/textures/_g.png b/digilines/textures/_g.png
index 5a85cde..5a85cde 100644
--- a/digilines_lcd/textures/_g.png
+++ b/digilines/textures/_g.png
Binary files differ
diff --git a/digilines_lcd/textures/_g_.png b/digilines/textures/_g_.png
index cc7bbc5..cc7bbc5 100644
--- a/digilines_lcd/textures/_g_.png
+++ b/digilines/textures/_g_.png
Binary files differ
diff --git a/digilines_lcd/textures/_gt.png b/digilines/textures/_gt.png
index f30855a..f30855a 100644
--- a/digilines_lcd/textures/_gt.png
+++ b/digilines/textures/_gt.png
Binary files differ
diff --git a/digilines_lcd/textures/_h.png b/digilines/textures/_h.png
index 1a66a9e..1a66a9e 100644
--- a/digilines_lcd/textures/_h.png
+++ b/digilines/textures/_h.png
Binary files differ
diff --git a/digilines_lcd/textures/_h_.png b/digilines/textures/_h_.png
index 87beafc..87beafc 100644
--- a/digilines_lcd/textures/_h_.png
+++ b/digilines/textures/_h_.png
Binary files differ
diff --git a/digilines_lcd/textures/_ha.png b/digilines/textures/_ha.png
index 4618ced..4618ced 100644
--- a/digilines_lcd/textures/_ha.png
+++ b/digilines/textures/_ha.png
Binary files differ
diff --git a/digilines_lcd/textures/_hs.png b/digilines/textures/_hs.png
index 6f12bec..6f12bec 100644
--- a/digilines_lcd/textures/_hs.png
+++ b/digilines/textures/_hs.png
Binary files differ
diff --git a/digilines_lcd/textures/_i.png b/digilines/textures/_i.png
index f001142..f001142 100644
--- a/digilines_lcd/textures/_i.png
+++ b/digilines/textures/_i.png
Binary files differ
diff --git a/digilines_lcd/textures/_i_.png b/digilines/textures/_i_.png
index fc658b8..fc658b8 100644
--- a/digilines_lcd/textures/_i_.png
+++ b/digilines/textures/_i_.png
Binary files differ
diff --git a/digilines_lcd/textures/_j.png b/digilines/textures/_j.png
index 87d2f26..87d2f26 100644
--- a/digilines_lcd/textures/_j.png
+++ b/digilines/textures/_j.png
Binary files differ
diff --git a/digilines_lcd/textures/_j_.png b/digilines/textures/_j_.png
index c0d9ac2..c0d9ac2 100644
--- a/digilines_lcd/textures/_j_.png
+++ b/digilines/textures/_j_.png
Binary files differ
diff --git a/digilines_lcd/textures/_k.png b/digilines/textures/_k.png
index 34f9336..34f9336 100644
--- a/digilines_lcd/textures/_k.png
+++ b/digilines/textures/_k.png
Binary files differ
diff --git a/digilines_lcd/textures/_k_.png b/digilines/textures/_k_.png
index 86b623d..86b623d 100644
--- a/digilines_lcd/textures/_k_.png
+++ b/digilines/textures/_k_.png
Binary files differ
diff --git a/digilines_lcd/textures/_l.png b/digilines/textures/_l.png
index defe7ec..defe7ec 100644
--- a/digilines_lcd/textures/_l.png
+++ b/digilines/textures/_l.png
Binary files differ
diff --git a/digilines_lcd/textures/_l_.png b/digilines/textures/_l_.png
index 3fe1de2..3fe1de2 100644
--- a/digilines_lcd/textures/_l_.png
+++ b/digilines/textures/_l_.png
Binary files differ
diff --git a/digilines_lcd/textures/_lt.png b/digilines/textures/_lt.png
index ec7219d..ec7219d 100644
--- a/digilines_lcd/textures/_lt.png
+++ b/digilines/textures/_lt.png
Binary files differ
diff --git a/digilines_lcd/textures/_m.png b/digilines/textures/_m.png
index e0fe039..e0fe039 100644
--- a/digilines_lcd/textures/_m.png
+++ b/digilines/textures/_m.png
Binary files differ
diff --git a/digilines_lcd/textures/_m_.png b/digilines/textures/_m_.png
index 9164da6..9164da6 100644
--- a/digilines_lcd/textures/_m_.png
+++ b/digilines/textures/_m_.png
Binary files differ
diff --git a/digilines_lcd/textures/_mn.png b/digilines/textures/_mn.png
index 935a2fe..935a2fe 100644
--- a/digilines_lcd/textures/_mn.png
+++ b/digilines/textures/_mn.png
Binary files differ
diff --git a/digilines_lcd/textures/_n.png b/digilines/textures/_n.png
index ac10fd9..ac10fd9 100644
--- a/digilines_lcd/textures/_n.png
+++ b/digilines/textures/_n.png
Binary files differ
diff --git a/digilines_lcd/textures/_n_.png b/digilines/textures/_n_.png
index d4355c1..d4355c1 100644
--- a/digilines_lcd/textures/_n_.png
+++ b/digilines/textures/_n_.png
Binary files differ
diff --git a/digilines_lcd/textures/_o.png b/digilines/textures/_o.png
index 080e99d..080e99d 100644
--- a/digilines_lcd/textures/_o.png
+++ b/digilines/textures/_o.png
Binary files differ
diff --git a/digilines_lcd/textures/_o_.png b/digilines/textures/_o_.png
index 2d19051..2d19051 100644
--- a/digilines_lcd/textures/_o_.png
+++ b/digilines/textures/_o_.png
Binary files differ
diff --git a/digilines_lcd/textures/_p.png b/digilines/textures/_p.png
index 3050959..3050959 100644
--- a/digilines_lcd/textures/_p.png
+++ b/digilines/textures/_p.png
Binary files differ
diff --git a/digilines_lcd/textures/_p_.png b/digilines/textures/_p_.png
index 0cca011..0cca011 100644
--- a/digilines_lcd/textures/_p_.png
+++ b/digilines/textures/_p_.png
Binary files differ
diff --git a/digilines_lcd/textures/_pr.png b/digilines/textures/_pr.png
index b835141..b835141 100644
--- a/digilines_lcd/textures/_pr.png
+++ b/digilines/textures/_pr.png
Binary files differ
diff --git a/digilines_lcd/textures/_ps.png b/digilines/textures/_ps.png
index 1f4b5c1..1f4b5c1 100644
--- a/digilines_lcd/textures/_ps.png
+++ b/digilines/textures/_ps.png
Binary files differ
diff --git a/digilines_lcd/textures/_q.png b/digilines/textures/_q.png
index 945b6cf..945b6cf 100644
--- a/digilines_lcd/textures/_q.png
+++ b/digilines/textures/_q.png
Binary files differ
diff --git a/digilines_lcd/textures/_q_.png b/digilines/textures/_q_.png
index f3bf455..f3bf455 100644
--- a/digilines_lcd/textures/_q_.png
+++ b/digilines/textures/_q_.png
Binary files differ
diff --git a/digilines_lcd/textures/_qo.png b/digilines/textures/_qo.png
index 5d261e3..5d261e3 100644
--- a/digilines_lcd/textures/_qo.png
+++ b/digilines/textures/_qo.png
Binary files differ
diff --git a/digilines_lcd/textures/_qu.png b/digilines/textures/_qu.png
index 5eb597a..5eb597a 100644
--- a/digilines_lcd/textures/_qu.png
+++ b/digilines/textures/_qu.png
Binary files differ
diff --git a/digilines_lcd/textures/_r.png b/digilines/textures/_r.png
index 39e9fce..39e9fce 100644
--- a/digilines_lcd/textures/_r.png
+++ b/digilines/textures/_r.png
Binary files differ
diff --git a/digilines_lcd/textures/_r_.png b/digilines/textures/_r_.png
index 6c71c1e..6c71c1e 100644
--- a/digilines_lcd/textures/_r_.png
+++ b/digilines/textures/_r_.png
Binary files differ
diff --git a/digilines_lcd/textures/_re.png b/digilines/textures/_re.png
index 1614837..1614837 100644
--- a/digilines_lcd/textures/_re.png
+++ b/digilines/textures/_re.png
Binary files differ
diff --git a/digilines_lcd/textures/_s.png b/digilines/textures/_s.png
index a0ada1a..a0ada1a 100644
--- a/digilines_lcd/textures/_s.png
+++ b/digilines/textures/_s.png
Binary files differ
diff --git a/digilines_lcd/textures/_s_.png b/digilines/textures/_s_.png
index 9b018bb..9b018bb 100644
--- a/digilines_lcd/textures/_s_.png
+++ b/digilines/textures/_s_.png
Binary files differ
diff --git a/digilines_lcd/textures/_sl.png b/digilines/textures/_sl.png
index 08c9547..08c9547 100644
--- a/digilines_lcd/textures/_sl.png
+++ b/digilines/textures/_sl.png
Binary files differ
diff --git a/digilines_lcd/textures/_sm.png b/digilines/textures/_sm.png
index 385c64f..385c64f 100644
--- a/digilines_lcd/textures/_sm.png
+++ b/digilines/textures/_sm.png
Binary files differ
diff --git a/digilines_lcd/textures/_sp.png b/digilines/textures/_sp.png
index 4f38a35..4f38a35 100644
--- a/digilines_lcd/textures/_sp.png
+++ b/digilines/textures/_sp.png
Binary files differ
diff --git a/digilines_lcd/textures/_sr.png b/digilines/textures/_sr.png
index bc9c0a2..bc9c0a2 100644
--- a/digilines_lcd/textures/_sr.png
+++ b/digilines/textures/_sr.png
Binary files differ
diff --git a/digilines_lcd/textures/_t.png b/digilines/textures/_t.png
index c55731a..c55731a 100644
--- a/digilines_lcd/textures/_t.png
+++ b/digilines/textures/_t.png
Binary files differ
diff --git a/digilines_lcd/textures/_t_.png b/digilines/textures/_t_.png
index 773e666..773e666 100644
--- a/digilines_lcd/textures/_t_.png
+++ b/digilines/textures/_t_.png
Binary files differ
diff --git a/digilines_lcd/textures/_tl.png b/digilines/textures/_tl.png
index 059fe68..059fe68 100644
--- a/digilines_lcd/textures/_tl.png
+++ b/digilines/textures/_tl.png
Binary files differ
diff --git a/digilines_lcd/textures/_u.png b/digilines/textures/_u.png
index 98bf8e6..98bf8e6 100644
--- a/digilines_lcd/textures/_u.png
+++ b/digilines/textures/_u.png
Binary files differ
diff --git a/digilines_lcd/textures/_u_.png b/digilines/textures/_u_.png
index 35ce915..35ce915 100644
--- a/digilines_lcd/textures/_u_.png
+++ b/digilines/textures/_u_.png
Binary files differ
diff --git a/digilines_lcd/textures/_un.png b/digilines/textures/_un.png
index 01f547a..01f547a 100644
--- a/digilines_lcd/textures/_un.png
+++ b/digilines/textures/_un.png
Binary files differ
diff --git a/digilines_lcd/textures/_v.png b/digilines/textures/_v.png
index b692d11..b692d11 100644
--- a/digilines_lcd/textures/_v.png
+++ b/digilines/textures/_v.png
Binary files differ
diff --git a/digilines_lcd/textures/_v_.png b/digilines/textures/_v_.png
index 8049771..8049771 100644
--- a/digilines_lcd/textures/_v_.png
+++ b/digilines/textures/_v_.png
Binary files differ
diff --git a/digilines_lcd/textures/_vb.png b/digilines/textures/_vb.png
index 7fed7dc..7fed7dc 100644
--- a/digilines_lcd/textures/_vb.png
+++ b/digilines/textures/_vb.png
Binary files differ
diff --git a/digilines_lcd/textures/_w.png b/digilines/textures/_w.png
index 6a58b07..6a58b07 100644
--- a/digilines_lcd/textures/_w.png
+++ b/digilines/textures/_w.png
Binary files differ
diff --git a/digilines_lcd/textures/_w_.png b/digilines/textures/_w_.png
index 64904de..64904de 100644
--- a/digilines_lcd/textures/_w_.png
+++ b/digilines/textures/_w_.png
Binary files differ
diff --git a/digilines_lcd/textures/_x.png b/digilines/textures/_x.png
index b769e13..b769e13 100644
--- a/digilines_lcd/textures/_x.png
+++ b/digilines/textures/_x.png
Binary files differ
diff --git a/digilines_lcd/textures/_x_.png b/digilines/textures/_x_.png
index 2f6d067..2f6d067 100644
--- a/digilines_lcd/textures/_x_.png
+++ b/digilines/textures/_x_.png
Binary files differ
diff --git a/digilines_lcd/textures/_y.png b/digilines/textures/_y.png
index 777b55e..777b55e 100644
--- a/digilines_lcd/textures/_y.png
+++ b/digilines/textures/_y.png
Binary files differ
diff --git a/digilines_lcd/textures/_y_.png b/digilines/textures/_y_.png
index 0c40de9..0c40de9 100644
--- a/digilines_lcd/textures/_y_.png
+++ b/digilines/textures/_y_.png
Binary files differ
diff --git a/digilines_lcd/textures/_z.png b/digilines/textures/_z.png
index ae010fe..ae010fe 100644
--- a/digilines_lcd/textures/_z.png
+++ b/digilines/textures/_z.png
Binary files differ
diff --git a/digilines_lcd/textures/_z_.png b/digilines/textures/_z_.png
index 1c3e053..1c3e053 100644
--- a/digilines_lcd/textures/_z_.png
+++ b/digilines/textures/_z_.png
Binary files differ
diff --git a/digilines_lightsensor/textures/digilines_lightsensor.png b/digilines/textures/digilines_lightsensor.png
index aa88495..aa88495 100644
--- a/digilines_lightsensor/textures/digilines_lightsensor.png
+++ b/digilines/textures/digilines_lightsensor.png
Binary files differ
diff --git a/digilines_rtc/textures/digilines_rtc.png b/digilines/textures/digilines_rtc.png
index a7b1d84..a7b1d84 100644
--- a/digilines_rtc/textures/digilines_rtc.png
+++ b/digilines/textures/digilines_rtc.png
Binary files differ
diff --git a/digilines_lcd/textures/lcd_anyside.png b/digilines/textures/lcd_anyside.png
index fe88e8d..fe88e8d 100644
--- a/digilines_lcd/textures/lcd_anyside.png
+++ b/digilines/textures/lcd_anyside.png
Binary files differ
diff --git a/digilines_lcd/textures/lcd_lcd.png b/digilines/textures/lcd_lcd.png
index c959fa1..c959fa1 100644
--- a/digilines_lcd/textures/lcd_lcd.png
+++ b/digilines/textures/lcd_lcd.png
Binary files differ
diff --git a/digilines_inventory/depends.txt b/digilines_inventory/depends.txt
deleted file mode 100644
index da1d119..0000000
--- a/digilines_inventory/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-digilines
diff --git a/digilines_lightsensor/depends.txt b/digilines_lightsensor/depends.txt
deleted file mode 100644
index da1d119..0000000
--- a/digilines_lightsensor/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-digilines
diff --git a/digilines_rtc/depends.txt b/digilines_rtc/depends.txt
deleted file mode 100644
index da1d119..0000000
--- a/digilines_rtc/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-digilines
diff --git a/moreblocks/README.md b/moreblocks/README.md
index 228ce97..511fda4 100644
--- a/moreblocks/README.md
+++ b/moreblocks/README.md
@@ -8,4 +8,6 @@ To install, just clone this repository into your "mods" directory.
More Blocks code is licensed under the zlib license, textures are by Calinou and are licensed under CC BY-SA 3.0 Unported.
+moreblocks_copperpatina.png is by pithydon licensed under WTFPL
+
**Forum topic:** <https://forum.minetest.net/viewtopic.php?f=11&t=509>
diff --git a/pipeworks/init.lua b/pipeworks/init.lua
index 92ce02c..499f6ba 100644
--- a/pipeworks/init.lua
+++ b/pipeworks/init.lua
@@ -16,9 +16,11 @@ pipeworks.modpath = minetest.get_modpath("pipeworks")
dofile(pipeworks.modpath.."/default_settings.txt")
-- Read the external config file if it exists.
-if io.open(pipeworks.worldpath.."/pipeworks_settings.txt","r") then
- dofile(pipeworks.worldpath.."/pipeworks_settings.txt")
- io.close()
+local worldsettingspath = pipeworks.worldpath.."/pipeworks_settings.txt"
+local worldsettingsfile = io.open(worldsettingspath, "r")
+if worldsettingsfile then
+ worldsettingsfile:close()
+ dofile(worldsettingspath)
end
-- Random variables
diff --git a/teleport_request/README.md b/teleport_request/README.md
index ef13230..4044acd 100644
--- a/teleport_request/README.md
+++ b/teleport_request/README.md
@@ -13,28 +13,38 @@ Players may also teleport to coordinates, however if the area is protected, the
##Usage:
``` /tpr [playername] ```
+- **Name:** Teleport Request
- **Description:** Requests permission to teleport to another player, where [playername] is their exact name.
- **Required Privilege:** interact
- **Example Usage:** */tpr RobbieF* - requests permission from RobbieF to teleport to them.
- **Notes:** Usernames are case-sensitive.
``` /tphr [playername] ```
+- **Name:** Teleport Here Request
- **Description:** Request permission to teleport another player to you.
- **Required Privilege:** interact
- **Example Usage:** /tphr RobbieF - requests RobbieF to teleport to you.
- **Notes:** Usernames are case-sensitive.
``` /tpc [x,y,z] ```
+- **Name:** Teleport to Coordinates
- **Description:** Teleport to coordinates.
- **Required Privilege:** interact, tp_tpc
- **Notes:** Honors area protection: if the area is protected, it must be owned by you in order to teleport to it.
``` /tpj [axis] [distance] ```
-- **Description:** Teleport a specified distance along a single specified axis. Useful for fast evading.
+- **Name:** Teleport Jump
+- **Description:** Teleport a specified distance along a single specified axis.
- **Required Privilege:** interact
- **Available Options for *axis*:** x, y, z
- **Example Usage:** '/tpj y 10' - teleport 10 nodes into the air.
+``` /tpe ```
+- **Name:** Teleport Evade
+- **Description:** In a sticky situation? Evade your enemy by teleporting to several nearby coordinates in random pattern. There's no knowing where you'll end up.
+- **Required Privilege:** interact
+- **Example Usage:** '/tpe' - teleports you to a random number of random coordinates in an evasive pattern.
+
``` /tpy ```
- **Description:** Accept a user's request to teleport to you or teleport you to them.
diff --git a/teleport_request/init.lua b/teleport_request/init.lua
index 721939d..a586769 100644
--- a/teleport_request/init.lua
+++ b/teleport_request/init.lua
@@ -316,11 +316,13 @@ minetest.register_chatcommand("tpe", {
minetest.register_chatcommand("tpy", {
description = "Accept teleport requests from another player",
+ privs = {interact=true},
func = tpr_accept
})
minetest.register_chatcommand("tpn", {
description = "Deny teleport requests from another player",
+ privs = {interact=true},
func = tpr_deny
})