diff --git a/mods/armor/README.txt b/mods/armor/README.txt index 00169f2..956b13c 100644 --- a/mods/armor/README.txt +++ b/mods/armor/README.txt @@ -5,5 +5,5 @@ By Kaadmy, for Pixture Adds craftable and wearable armor -Asset license: CC0 -Source code license: MIT +Asset license: WTFPL +Source code license: WTFPL diff --git a/mods/bed/README.txt b/mods/bed/README.txt index 75af475..9a01c9d 100644 --- a/mods/bed/README.txt +++ b/mods/bed/README.txt @@ -5,5 +5,5 @@ Tweaked by Kadmy, for Pixture Right-click a bed to sleep, right-click again to get out. -Asset license: CC0 -Source license: MIT(originally WTFPL) +Asset license: WTFPL +Source licens: WTFPL diff --git a/mods/book/README.txt b/mods/book/README.txt index 109fcd0..d6f3c15 100644 --- a/mods/book/README.txt +++ b/mods/book/README.txt @@ -7,4 +7,4 @@ Mod originally designed for Pixture, may not work elsewhere This mod adds books that can be written to, just left-click while holding one, write, and save -Source license: MIT +Source license: WTFPL diff --git a/mods/builtin_item/README.txt b/mods/builtin_item/README.txt index a08a18b..5a0a10d 100644 --- a/mods/builtin_item/README.txt +++ b/mods/builtin_item/README.txt @@ -5,4 +5,4 @@ Tweaked by Kaadmy, for Pixture Items are now destroyed by lava and flow with water. -Source license: MIT(originally WTFPL) +Source license: WTFPL diff --git a/mods/craftingguide/README.txt b/mods/craftingguide/README.txt index bda8260..b7fe722 100644 --- a/mods/craftingguide/README.txt +++ b/mods/craftingguide/README.txt @@ -5,5 +5,5 @@ By Kaadmy, for Pixture This mod adds a crafting guide in your inventory. -Asset license: CC0 -Source license: MIT +Asset license: WTFPL +Source license: WTFPL diff --git a/mods/default/README.txt b/mods/default/README.txt index e20d034..1d53acd 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -6,5 +6,5 @@ Adds the required stuff to run WARNING: This mod will not be compatible with existing mods, tons of stuff has been renamed! -Asset license: CC0 -Source license: MIT(Some parts copied from minetest_game) +Asset license: WTFPL +Source license: WTFPL(Some code from minetest_game's default mod) diff --git a/mods/default/formspec.lua b/mods/default/formspec.lua index 05ca236..875a67b 100644 --- a/mods/default/formspec.lua +++ b/mods/default/formspec.lua @@ -270,14 +270,19 @@ default.ui.register_page("core_notabs", form_core_notabs) default.ui.register_page("core_notabs_2part", form_core_notabs .. "background[0,0;8.5,4.5;ui_formspec_bg_short.png]") local form_crafting = default.ui.get_page("core_2part") +form_crafting = form_crafting .. "list[current_player;main;0.25,4.75;8,4;]" +form_crafting = form_crafting .. "listring[current_player;main]" +form_crafting = form_crafting .. default.ui.get_hotbar_itemslot_bg(0.25, 4.75, 8, 1) +form_crafting = form_crafting .. default.ui.get_itemslot_bg(0.25, 5.75, 8, 3) + form_crafting = form_crafting .. "list[current_player;craft;2.25,0.75;3,3;]" +form_crafting = form_crafting .. "listring[current_player;craft]" + form_crafting = form_crafting .. "image[5.25,1.75;1,1;ui_arrow.png^[transformR270]" + form_crafting = form_crafting .. "list[current_player;craftpreview;6.25,1.75;1,1;]" form_crafting = form_crafting .. default.ui.get_itemslot_bg(2.25, 0.75, 3, 3) form_crafting = form_crafting .. default.ui.get_itemslot_bg(6.25, 1.75, 1, 1) -form_crafting = form_crafting .. "list[current_player;main;0.25,4.75;8,4;]" -form_crafting = form_crafting .. default.ui.get_hotbar_itemslot_bg(0.25, 4.75, 8, 1) -form_crafting = form_crafting .. default.ui.get_itemslot_bg(0.25, 5.75, 8, 3) default.ui.register_page("core_crafting", form_crafting) function default.ui.receive_fields(player, form_name, fields) diff --git a/mods/default/furnace.lua b/mods/default/furnace.lua index deeb746..d136f3c 100644 --- a/mods/default/furnace.lua +++ b/mods/default/furnace.lua @@ -5,27 +5,27 @@ function default.furnace_active_formspec(percent, item_percent) local form = default.ui.get_page("core_2part") form = form .. "list[current_player;main;0.25,4.75;8,4;]" - form_furnace = form_furnace .. "listring[current_player;main]" + form = form .. "listring[current_player;main]" form = form .. default.ui.get_hotbar_itemslot_bg(0.25, 4.75, 8, 1) form = form .. default.ui.get_itemslot_bg(0.25, 5.75, 8, 3) form = form .. "list[current_name;src;2.25,0.75;1,1;]" - form_furnace = form_furnace .. "listring[current_name;src]" + form = form .. "listring[current_name;src]" form = form .. default.ui.get_itemslot_bg(2.25, 0.75, 1, 1) form = form .. "list[current_name;fuel;2.25,2.75;1,1;]" form = form .. default.ui.get_itemslot_bg(2.25, 2.75, 1, 1) form = form .. "list[current_name;dst;4.25,1.25;2,2;]" - form_furnace = form_furnace .. "listring[current_name;dst]" + form = form .. "listring[current_name;dst]" form = form .. default.ui.get_hotbar_itemslot_bg(4.25, 1.25, 2, 2) form = form .. "image[2.25,1.75;1,1;ui_fire_bg.png^[lowpart:" form = form .. (100-percent) .. ":ui_fire.png]" form = form .. "image[3.25,1.75;1,1;ui_arrow_bg.png^[lowpart:" form = form .. (item_percent) .. ":ui_arrow.png^[transformR270]" - return form + return form end local form_furnace = default.ui.get_page("core_2part") diff --git a/mods/door/README.txt b/mods/door/README.txt index b018dba..3d541ae 100644 --- a/mods/door/README.txt +++ b/mods/door/README.txt @@ -5,5 +5,5 @@ Tweaked by Kaadmy, for Pixture Right-click doors to open/close them -Asset license: CC0 -Source license: MIT(originally WTFPL) +Asset license: WTFPL +Source license: WTFPL diff --git a/mods/farming/README.txt b/mods/farming/README.txt index b158bbe..25966eb 100644 --- a/mods/farming/README.txt +++ b/mods/farming/README.txt @@ -5,5 +5,5 @@ By Kaadmy, for Pixture Place wheat/cotton seeds near water When they become stage 4, they can be harvested -Asset license: CC0 -Source license: MIT +Asset license: WTFPL +Source license: WTFPL diff --git a/mods/gold/README.txt b/mods/gold/README.txt index 234903c..ea3910a 100644 --- a/mods/gold/README.txt +++ b/mods/gold/README.txt @@ -4,5 +4,5 @@ By Kaadmy, for Pixture Trading/currency mod; required by mobs -Asset license: CC0 -Source license: MIT +Asset license: WTFPL +Source license: WTFPL diff --git a/mods/hunger/README.txt b/mods/hunger/README.txt index 1fead96..07cf872 100644 --- a/mods/hunger/README.txt +++ b/mods/hunger/README.txt @@ -1,12 +1,12 @@ Hunger mod ========== -For nodetest +For Voxelgarden(By Casimir?) Tweaked by Kaadmy, for Pixture -Only mod that isn't MIT or WTFPL :( +Only mod that isn't WTFPL :( Though most is re-written anyway... -Asset license: CC0 +Asset license: WTFPL Source license: This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/mods/item_drop/README.txt b/mods/item_drop/README.txt index f1fafe3..4682b7a 100644 --- a/mods/item_drop/README.txt +++ b/mods/item_drop/README.txt @@ -3,5 +3,5 @@ Item drop mod By PilzAdam Tweaked by Kaadmy, for Pixture -Asset license: CC0(original was WTFPL) -Source license: CC0(original was WTFPL) +Asset license: WTFPL +Source license: WTFPL diff --git a/mods/mobs/README.txt b/mods/mobs/README.txt index 4363918..ebc35f2 100644 --- a/mods/mobs/README.txt +++ b/mods/mobs/README.txt @@ -3,5 +3,5 @@ Mobs mod By PilzAdam, KrupnovPavel, Zeg9, TenPlus1 Tweaked by Kaadmy, for Pixture -Asset license: CC0 -Source License: MIT(originally WTFPL) +Asset license: WTFPL +Source License: WTFPL diff --git a/mods/music/README.txt b/mods/music/README.txt index f3588e0..a3de7e4 100644 --- a/mods/music/README.txt +++ b/mods/music/README.txt @@ -6,4 +6,5 @@ Music license: music_catsong: Dan Knoflicek(CC0) music_wonderful_nightmare.ogg: SpiderDave(CC0) -Source License: MIT +Texture license: WTFPL +Source License: WTFPL diff --git a/mods/nav/README.txt b/mods/nav/README.txt index bd8cadb..28ff341 100644 --- a/mods/nav/README.txt +++ b/mods/nav/README.txt @@ -4,5 +4,5 @@ By Kaadmy, for Pixture Navigation, compass and waypoint API -Asset license: CC0 -Source license: MIT +Asset license: WTFPL +Source license: WTFPL diff --git a/mods/util/README.txt b/mods/util/README.txt index 5ab6fea..785a827 100644 --- a/mods/util/README.txt +++ b/mods/util/README.txt @@ -2,4 +2,4 @@ Utility mod =========== By Kaadmy, for Pixture -Source license: MIT +Source license: WTFPL diff --git a/mods/village/README.txt b/mods/village/README.txt index 31c312b..869f711 100644 --- a/mods/village/README.txt +++ b/mods/village/README.txt @@ -2,5 +2,5 @@ Villages mod ============ By Kaadmy, for Pixture -Asset license: CC0 -Source license: MIT +Asset license: WTFPL +Source license: WTFPL diff --git a/mods/weather/README.txt b/mods/weather/README.txt index f08b20c..78f7c26 100644 --- a/mods/weather/README.txt +++ b/mods/weather/README.txt @@ -2,9 +2,9 @@ Weather mod =========== By Kaadmy, for Pixture -Texture license: CC0 +Texture license: WTFPL Sound license: weather_night.ogg: CC0 - weather_storm.ogg: GPLv2(Replace this, I want CC0-only assets) - weather_snowstorm.ogg: GPLv2(Replace this, I want CC0-only assets) -Source license: MIT + weather_storm.ogg: GPLv2(Replace this, I want CC0/WTFPL-only assets) + weather_snowstorm.ogg: GPLv2(Replace this, I want CC0/WTFPL-only assets) +Source license: WTFPL diff --git a/mods/wielditem/README.txt b/mods/wielditem/README.txt index b068e45..3be6713 100644 --- a/mods/wielditem/README.txt +++ b/mods/wielditem/README.txt @@ -4,4 +4,4 @@ By Kaadmy, for Pixture Shows the wield item in 3rd person view -Source license: MIT +Source license: WTFPL