Skip to content

Merge further improvements submitted to my fork #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
h-v-smacker wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Merge further improvements submitted to my fork #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4071132
Shaper machine
Jun 12, 2019
934525b
make output ratio optional
Jun 12, 2019
9402a6e
show the owner name
Jun 15, 2019
25d873b
light fix
Jul 11, 2019
e0c9fda
more shapes from columnia
Jun 22, 2019
6a0dee6
+attribution
Jun 22, 2019
dc0a350
columnia detection and file separation
Jun 23, 2019
67cc0a7
output ajustment
Jun 23, 2019
0384abf
mixed stock/original rotation mechanics for columnia
Jun 23, 2019
3744eb5
Merge branch 'master' of https://github.com/TumeniNodes/facade
Jul 11, 2019
78303b1
Merge branch 'columnia_shapes' into columnia_support
Jul 11, 2019
a634838
fix allow_metadata_inventory_move so that it doesnt crash
fluxionary Aug 28, 2019
7e88d78
adjust rgspro nodeboxes
fluxionary Aug 28, 2019
d6d329c
cleanup; refactor; add settings; allow other mods to register facades
fluxionary Aug 28, 2019
e8aec4d
clean up some stuff; remove broken items
fluxionary Aug 28, 2019
ce94001
fix typo in param name
fluxionary Aug 29, 2019
bf0fad5
Merge pull request #1 from BlockySurvival/fix_crash
h-v-smacker Oct 29, 2019
bb666d3
Merge pull request #2 from BlockySurvival/API_cleanup
h-v-smacker Oct 29, 2019
d707c77
some formatting cleanup
Oct 29, 2019
515fb20
merge of columnia support and improvements from fluctionary
Oct 29, 2019
c0ab417
resolve conflicts
Oct 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
facade = {}
facade = {}

-- Define the shapes and registration functions
dofile (minetest.get_modpath("facade") .. "/shapes.lua")
Expand All @@ -7,4 +7,4 @@ dofile (minetest.get_modpath("facade") .. "/shapes.lua")
dofile (minetest.get_modpath("facade") .. "/materials.lua")

-- Add a dedicated machine to produce the facade shapes
dofile (minetest.get_modpath("facade") .. "/shaper.lua")
dofile(minetest.get_modpath("facade") .. "/shaper.lua")
46 changes: 23 additions & 23 deletions materials.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,32 @@ facade.register_facade_nodes("default", "silver_sandstone", "default:silver_sand
--facade.register_facade_nodes("default", "obsidian", "default:obsidian", "Obsidian")


if minetest.get_modpath( "bakedclay") then
local clay = {
{"white", "White"},
{"grey", "Grey"},
{"black", "Black"},
{"red", "Red"},
{"yellow", "Yellow"},
{"green", "Green"},
{"cyan", "Cyan"},
{"blue", "Blue"},
{"magenta", "Magenta"},
{"orange", "Orange"},
{"violet", "Violet"},
{"brown", "Brown"},
{"pink", "Pink"},
{"dark_grey", "Dark Grey"},
{"dark_green", "Dark Green"},
}

for _, clay in pairs(clay) do
facade.register_facade_nodes("baked_clay", clay[1] , "bakedclay:" .. clay[1], clay[2] .. " Baked Clay")
end
if minetest.get_modpath("bakedclay") then
local clays = {
{ "white", "White" },
{ "grey", "Grey" },
{ "black", "Black" },
{ "red", "Red" },
{ "yellow", "Yellow" },
{ "green", "Green" },
{ "cyan", "Cyan" },
{ "blue", "Blue" },
{ "magenta", "Magenta" },
{ "orange", "Orange" },
{ "violet", "Violet" },
{ "brown", "Brown" },
{ "pink", "Pink" },
{ "dark_grey", "Dark Grey" },
{ "dark_green", "Dark Green" },
}

for _, clay in pairs(clays) do
facade.register_facade_nodes("baked_clay", clay[1], "bakedclay:" .. clay[1], clay[2] .. " Baked Clay")
end
end


if minetest.get_modpath( "darkage") then
if minetest.get_modpath("darkage") then
facade.register_facade_nodes("darkage", "basalt", "darkage:basalt", "Basalt")
facade.register_facade_nodes("darkage", "chalk", "darkage:chalk", "Chalk")
facade.register_facade_nodes("darkage", "gneiss", "darkage:gneiss", "Gneiss")
Expand Down
2 changes: 2 additions & 0 deletions settingtypes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
facade.in_creative_inventory (Facades show in inventory) bool true
Copy link
Contributor

@Panquesito7 Panquesito7 May 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
facade.in_creative_inventory (Facades show in inventory) bool true
facade.in_creative_inventory (Enable facades in creative inventory) bool true

facade.protect_inventories (Facade shaper is protected) bool false
Copy link
Contributor

@Panquesito7 Panquesito7 May 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
facade.protect_inventories (Facade shaper is protected) bool false
facade.protect_inventories (Enable shaper protection) bool false

Loading