Reload/VoxeLibre
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 into fixes

Browse Source
This commit is contained in:
Elias Fleckenstein 2021-01-03 15:17:08 +01:00
commit 6b2416b211
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -14,9 +14,10 @@ Or you can play in “creative mode” in which you can build almost anything in
#### Gameplay summary #### Gameplay summary
* Sandbox-style gameplay, no goals (for now) * Sandbox-style gameplay, no goals
* Survive: Fight against hostile monsters and hunger * Survive: Fight against hostile monsters and hunger
* Mine for ores and other treasures * Mine for ores and other treasures
* Magic: Gain experience and enchant your tools
* Use the collected blocks to create great buildings, your imagination is the limit * Use the collected blocks to create great buildings, your imagination is the limit
* Collect flowers (and other dye sources) and colorize your world * Collect flowers (and other dye sources) and colorize your world
* Find some seeds and start farming * Find some seeds and start farming
@ -102,7 +103,7 @@ big bugs (such as “missing node” errors or even crashes).
The following main features are available: The following main features are available:
* Tools, weapons * Tools, weapons
* Armor (unbalanced) * Armor
* Crafting system: 2×2 grid, crafting table (3×3 grid), furnace, including a crafting guide * Crafting system: 2×2 grid, crafting table (3×3 grid), furnace, including a crafting guide
* Chests, large chests, ender chests, shulker boxes * Chests, large chests, ender chests, shulker boxes
* Furnaces, hoppers * Furnaces, hoppers
@ -117,6 +118,8 @@ The following main features are available:
* Redstone circuits (partially) * Redstone circuits (partially)
* Minecarts (partial) * Minecarts (partial)
* Status effects (partial) * Status effects (partial)
* Experience
* Enchanting
* Brewing, potions, tipped arrow (partial) * Brewing, potions, tipped arrow (partial)
* Boats * Boats
* Fire * Fire
@ -142,12 +145,9 @@ The following main features are available:
The following features are incomplete: The following features are incomplete:
* Generated structures (especially villages) * Generated structures (especially villages)
* NPCs
* Some monsters and animals * Some monsters and animals
* Redstone-related things * Redstone-related things
* The End * The End
* Enchanting
* Experience
* Special minecarts * Special minecarts
* A couple of non-trivial blocks and items * A couple of non-trivial blocks and items
@ -261,7 +261,6 @@ Various sources. See the respective mod directories for details.
## Info for programmers ## Info for programmers
You find interesting and useful infos in `API.md`. You find interesting and useful infos in `API.md`.
This project is currently mostly a one-person project.
## Legal information ## Legal information
This is a fan game, not developed or endorsed by Mojang AB. This is a fan game, not developed or endorsed by Mojang AB.

8
mods/HELP/mcl_craftguide/init.lua
View File

@ -1108,12 +1108,20 @@ if progressive_mode then
local meta = player:get_meta() local meta = player:get_meta()
local name = player:get_player_name() local name = player:get_player_name()
local data = player_data[name] local data = player_data[name]
local inv_items = data.inv_items
if not inv_items then
inv_items = {}
end
<<<<<<< HEAD
if not data or not data.inv_items then if not data or not data.inv_items then
return return
end end
meta:set_string("inv_items", serialize(data.inv_items)) meta:set_string("inv_items", serialize(data.inv_items))
=======
meta:set_string("inv_items", serialize(inv_items))
>>>>>>> 4c2f3f2b7cea5b132d7485b4d54def1fe72b8e46
end end
M.register_on_leaveplayer(function(player) M.register_on_leaveplayer(function(player)