From f2fa3df7fe6e05b904e469dc7a55c9b4329130fb Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 3 Jul 2018 17:37:37 -0700 Subject: [PATCH] mod.moreblocks: Update to v1.1.0 & patch 6dda839 Upstream: https://github.com/minetest-mods/moreblocks/tree/1.1.0 Patch: https://github.com/AntumMT/mod-moreblocks/tree/6dda839 --- README.md | 8 +-- mods/buildings/moreblocks/CHANGELOG.md | 25 ++++++-- mods/buildings/moreblocks/CONTRIBUTING.md | 14 ++-- mods/buildings/moreblocks/README.md | 74 ++++++++++++++++++++-- mods/buildings/moreblocks/circular_saw.lua | 2 +- 5 files changed, 101 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index c624ad2d..eee45c84 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m * [elevator][] ([WTFPL][lic.elevator]) * [fort_spikes][] ([MIT][lic.fort_spikes] / [CC0][lic.cc0]) -- version: [3c7d7c6 Git][ver.fort_spikes] *2017-05-06* ***UPDATES*** * [glass][] ([LGPL][lic.lgpl2.1] / [CC BY-SA][lic.ccbysa3.0]) -- version [d61a6c6 Git][ver.glass] *2017-08-15* - * [moreblocks][] ([zlib][lic.moreblocks]) -- version: [7347b05 Git][ver.moreblocks] *2017-08-12* ([patched][patch.moreblocks]) ***UPDATES*** + * [moreblocks][] ([zlib][lic.moreblocks]) -- version: [1.1.0][ver.moreblocks] *2018-04-21* ([patched][patch.moreblocks]) ***UNSTABLE UPDATES*** * [windmill][] ([WTFPL][lic.windmill]) -- version: [47b029d Git][ver.windmill] *2014-08-21* ([patched][patch.windmill]) * [campfire][] ([GPL][lic.gpl2.0] / [CC BY-SA][lic.ccbysa] / [WTFPL][lic.campfire]) -- version: [04b4ea5 Git][ver.campfire] *2017-06-08* ***UPDATES*** * chat/ @@ -61,7 +61,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m * [amber][] ([LGPL][lic.lgpl2.1]) -- version: [21637e8 Git][ver.amber] *2017-08-09* ***UPDATES*** * [gems_encrustable][] ([WTFPL][lic.wtfpl]) -- version: [81d513d Git][ver.gems_encrustable] *2012-07-31* ([patched][patch.gems_encrustable]) * [gems_tools][] ([GPL][lic.gpl3.0]) -- version: [b375432 Git][ver.gems_tools] *2016-09-03* ([patched][patch.gems_tools]) - * [moreores][] ([zlib][lic.moreores] / [CC BY-SA][lic.ccbysa3.0]) -- version: [2316595 Git][ver.moreores] *2018-04-21* ([patched][patch.moreores]) ***UPDATES*** + * [moreores][] ([zlib][lic.moreores] / [CC BY-SA][lic.ccbysa3.0]) -- version: [2316595 Git][ver.moreores] *2018-04-21* ([patched][patch.moreores]) * [quartz][] ([MIT][lic.quartz]) -- version: [00ca4eb Git][ver.quartz] *2017-02-28* ([patched][patch.quartz]) ***UPDATES*** * [rainbow_ore][] ([LGPL][lic.rainbow_ore]) -- version: [6e77693 Git][ver.rainbow_ore] *2015-11-02* ([patched][patch.rainbow_ore]) * [unifieddyes][] ([GPL][lic.gpl2.0]) -- version: [8b20a06 Git][ver.unifieddyes] *2017-06-04* ([patched][patch.unifieddyes]) ***UPDATES*** @@ -438,7 +438,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m [ver.monsters_aggressive]: https://github.com/AntumMT/mp-monsters_aggressive/tree/89a8187 [ver.monsters_passive]: https://github.com/AntumMT/mp-monsters_passive/tree/b07fe19 [ver.more_chests]: https://github.com/minetest-mods/more_chests/tree/c597779 -[ver.moreblocks]: https://github.com/minetest-mods/moreblocks/tree/7347b05 +[ver.moreblocks]: https://github.com/minetest-mods/moreblocks/tree/1.1.0 [ver.moremesecons]: https://github.com/minetest-mods/MoreMesecons/tree/aa2ae82 [ver.moreores]: https://github.com/minetest-mods/moreores/tree/2316595 [ver.mthudclock]: https://github.com/Rochambeau/mthudclock/tree/b3e2142 @@ -510,7 +510,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m [patch.mob-engine]: https://github.com/AntumMT/mp-mob-engine/tree/0b3706f [patch.mobs_animal]: https://github.com/AntumMT/mod-mobs_animal/tree/1d5f1ca [patch.mobs_redo]: https://github.com/AntumMT/mod-mobs_redo/tree/8872920 -[patch.moreblocks]: https://github.com/AntumMT/mod-moreblocks/tree/82aa7cd +[patch.moreblocks]: https://github.com/AntumMT/mod-moreblocks/tree/6dda839 [patch.moreores]: https://github.com/AntumMT/mod-moreores/tree/1cd9011 [patch.mydoors]: https://github.com/AntumMT/mp-mydoors/tree/e36c9d1 [patch.mypaint]: https://github.com/AntumMT/mod-mypaint/tree/10a5359 diff --git a/mods/buildings/moreblocks/CHANGELOG.md b/mods/buildings/moreblocks/CHANGELOG.md index 23564f85..ba3678d3 100644 --- a/mods/buildings/moreblocks/CHANGELOG.md +++ b/mods/buildings/moreblocks/CHANGELOG.md @@ -1,20 +1,35 @@ -# Change Log +# Changelog All notable changes to this project will be documented in this file. -The format is based on [Keep a Changelog](http://keepachangelog.com/) -and this project adheres to [Semantic Versioning](http://semver.org/). +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) +and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [1.1.0] - 2017-10-04 + ### Added - 3 new node shapes in the circular saw (thin slabs, available in "L-shaped", "corner-shaped" and "U-shaped" variations), all with 1/16 thickness. -- Stone Block, Desert Stone Block, Obsidian Block, Sandstone Block, Coral - Skeleton and Straw are now present as Stairs+ nodes. +- New Stairs+ nodes: + - Coral Skeleton + - Desert Sandstone, Silver Sandstone + - Desert Sandstone Brick, Silver Sandstone Brick + - Desert Sandstone Block, Silver Sandstone Block + - Obsidian Block + - Sandstone Block + - Stone Block, Desert Stone Block + - Straw + - Tin Block + - Wool (all colors) +- Other mods can now get a list of all the defined Stairs+ shapes ## [1.0.0] - 2017-02-19 - Initial versioned release. + +[1.1.0]: https://github.com/minetest-mods/moreblocks/compare/v1.0.0...v1.1.0 +[Unreleased]: https://github.com/minetest-mods/moreblocks/compare/v1.0.0...HEAD diff --git a/mods/buildings/moreblocks/CONTRIBUTING.md b/mods/buildings/moreblocks/CONTRIBUTING.md index 56fb5042..c435731a 100644 --- a/mods/buildings/moreblocks/CONTRIBUTING.md +++ b/mods/buildings/moreblocks/CONTRIBUTING.md @@ -1,10 +1,10 @@ -# Contribution Guide +# Contributing to More Blocks -Thank you for your interest in this mod! Before contributing, be sure to know -about these few guidelines: +Thank you for your interest in More Blocks! Before contributing, +be sure to know about these few guidelines: -- Contributions have to be under the zlib license (or compatible) for code, - and CC BY-SA 3.0 license (or compatible) for assets. -- Make sure to update the change log, keeping the - [change log format](http://keepachangelog.com/) we use. +- Contributions have to be licensed under the zlib license (or compatible) + for code, and CC BY-SA 3.0 (or compatible) for assets. +- Make sure to update the changelog, keeping the + [changelog format](http://keepachangelog.com/en/1.0.0/) we use. - Don't bump the version yourself. Maintainers will do this when necessary. diff --git a/mods/buildings/moreblocks/README.md b/mods/buildings/moreblocks/README.md index 767cb7c0..6c37b74a 100644 --- a/mods/buildings/moreblocks/README.md +++ b/mods/buildings/moreblocks/README.md @@ -1,12 +1,76 @@ # More Blocks -More Blocks for [Minetest](http://minetest.net), a free and open source infinite +More Blocks for [Minetest](https://www.minetest.net/), a free and open source infinite world block sandbox game. -To install, just clone this repository into your "mods" directory. +[**Forum topic**](https://forum.minetest.net/viewtopic.php?f=11&t=509) -More Blocks code is licensed under the zlib license, textures are by Calinou and are licensed under CC BY-SA 3.0 Unported. +## Installation -moreblocks_copperpatina.png is by pithydon licensed under CC0 1.0 +### Download the mod -**Forum topic:** +To install More Blocks, clone this Git repository into your Minetest's `mods/` +directory: + +``` +git clone https://github.com/minetest-mods/moreblocks.git +``` + +You can also +[download a ZIP archive](https://github.com/minetest-mods/moreblocks/archive/master.zip) +of More Blocks. If you do so, you will need to extract the archive, then rename +the resulting folder from `moreblocks-master` to `moreblocks` – this is +**absolutely** necessary to do, else, it won't work! + +### Enable the mod + +Once you have installed More Blocks, you need to enable it in Minetest. +The procedure is as follows: + +#### Using the client's main menu + +This is the easiest way to enable More Blocks when playing in singleplayer +(or on a server hosted from a client). + +1. Start Minetest and switch to the **Local Game** tab. +2. Select the world you want to enable More Blocks in. +3. Click **Configure**, then enable `moreblocks` by double-clicking it + (or ticking the **Enabled** checkbox). +4. Save the changes, then start a game on the world you enabled More Blocks on. +5. More Blocks should now be running on your world. + +#### Using a text editor + +This is the recommended way to enable the mod on a server without using a GUI. + +1. Make sure Minetest is not currently running (else, it will overwrite + the changes when exiting). +2. Open the world's `world.mt` file using a text editor. +3. Add the following line at the end of the file: + +``` +load_mod_moreblocks = true +``` + +If the line is already present in the file, then replace `false` with `true` on that line. + +4. Save the file, then start a game on the world you enabled More Blocks on. +5. More Blocks should now be running on your world. + +## Version compatibility + +More Blocks is currently primarily tested with Minetest 0.4.16. +It may or may not work with newer or older versions. Issues arising in older +versions than 0.4.16 will generally not be fixed. + +## License + +Copyright © 2011-2017 Hugo Locurcio and contributors + +- More Blocks code is licensed under the zlib license, see + [`LICENSE.md`](LICENSE.md) for details. +- Unless otherwise specified, More Blocks textures are licensed under + [CC BY-SA 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/). + +`moreblocks_copperpatina.png` was created by pithydon, and is licensed under +[CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/). diff --git a/mods/buildings/moreblocks/circular_saw.lua b/mods/buildings/moreblocks/circular_saw.lua index 7c4eb61b..6c3a9746 100644 --- a/mods/buildings/moreblocks/circular_saw.lua +++ b/mods/buildings/moreblocks/circular_saw.lua @@ -1,7 +1,7 @@ --[[ More Blocks: circular saw -Copyright (c) 2011-2017 Hugo Locurcio and contributors. +Copyright (c) 2011-2017 Hugo Locurcio, Sokomine and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]]