diff --git a/clientmods/kamikaze/init.lua b/clientmods/kamikaze/init.lua index 34321d0f8..921ecfcf9 100644 --- a/clientmods/kamikaze/init.lua +++ b/clientmods/kamikaze/init.lua @@ -3,8 +3,8 @@ local cpos={x=0,y=0,z=0} local crange=500 local hud_wp=nil local zz={x=0,y=64,z=0} -local badnodes={'mcl_tnt:tnt','mcl_fire:basic_flame','mcl_fire:eternal_fire','mcl_fire:fire','mcl_fire:fire_charge','mcl_sponges:sponge','mcl_sponges:sponge_wet'} --- +local badnodes={'mcl_tnt:tnt','mcl_fire:basic_flame','mcl_fire:eternal_fire','mcl_fire:fire','mcl_fire:fire_charge'} +--'mcl_sponges:sponge','mcl_sponges:sponge_wet' local searchheight=64 local function set_kwp(name,pos) diff --git a/clientmods/scaffold/init.lua b/clientmods/scaffold/init.lua index 679c27ee4..60ccc1411 100644 --- a/clientmods/scaffold/init.lua +++ b/clientmods/scaffold/init.lua @@ -129,6 +129,13 @@ if turtle then scaffold.place_if_able(turtle.dircoord(0, -1, -1)) end) end +if turtle then + scaffold.register_template_scaffold("headTriScaff", "scaffold_three_wide_head", function(pos) + scaffold.place_if_able(turtle.dircoord(0, 3, 0)) + scaffold.place_if_able(turtle.dircoord(0, 3, 1)) + scaffold.place_if_able(turtle.dircoord(0, 3, -1)) + end) +end if turtle then scaffold.register_template_scaffold("QuintScaffold", "scaffold_five_wide", function(pos) scaffold.place_if_able(pos) diff --git a/waspsaliva b/waspsaliva index 32d029f3c..c8466ca34 100755 --- a/waspsaliva +++ b/waspsaliva @@ -11,6 +11,8 @@ chatlogdir=~/.wschat mtpid=0 mtpath=$(dirname $0) dbg=1 +rm -f /tmp/$(whoami)-wsxt +rm -f /tmp/$(whoami)-wsmen if [ "$(echo $*|grep debug)" != "" ] || [ ! -z $4 ]; then dbg=0; fi mkdir -p $chatlogdir if [ -f $pwf ]; then pas=$(cat $pwf); fi @@ -55,7 +57,7 @@ startmt() { if [ $tomenu -eq 0 ]; then startmt menu else -while true; do + while true; do if [ -f /tmp/$(whoami)-wsxt ]; then rm -f /tmp/$(whoami)-wsxt break