From f421c673727ff03adfbf8d0c3d4fa2c807555df6 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 22 May 2019 09:39:06 +0200 Subject: [PATCH 1/9] Fix Centered Wooden Tile crafting This closes #145. --- CHANGELOG.md | 4 ++++ crafting.lua | 20 +++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6199159..02dd4d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. for their smaller visual size. - The minimum supported Minetest version is now 5.0.0. +### Fixed + +- Fixed a recipe conflict that made Centered Wooden Tiles impossible to craft. + ## [1.3.0] - 2019-03-23 ### Changed diff --git a/crafting.lua b/crafting.lua index 468667d..0655391 100644 --- a/crafting.lua +++ b/crafting.lua @@ -35,15 +35,6 @@ minetest.register_craft({ recipe = {"default:junglegrass", "default:cobble"}, }) -minetest.register_craft({ - output = "moreblocks:wood_tile_center 9", - recipe = { - {"group:wood", "group:wood", "group:wood"}, - {"group:wood", "moreblocks:wood_tile", "group:wood"}, - {"group:wood", "group:wood", "group:wood"}, - } -}) - minetest.register_craft({ output = "moreblocks:wood_tile 9", recipe = { @@ -53,6 +44,17 @@ minetest.register_craft({ } }) +-- This must be registered after `moreblocks:wood_tile` to avoid recipe conflicts, +-- since `moreblocks:wood_tile` is part of `group:wood` +minetest.register_craft({ + output = "moreblocks:wood_tile_center 9", + recipe = { + {"group:wood", "group:wood", "group:wood"}, + {"group:wood", "moreblocks:wood_tile", "group:wood"}, + {"group:wood", "group:wood", "group:wood"}, + } +}) + minetest.register_craft({ type = "shapeless", output = "moreblocks:wood_tile", From b2f1163dad22739e3276eb80fecff323063e698c Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 22 May 2019 11:33:15 +0200 Subject: [PATCH 2/9] changelog: Put the supported version at the top of the Changed section This makes it easier to notice. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02dd4d2..217536c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,9 +14,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed +- The minimum supported Minetest version is now 5.0.0. - Stairs+ nodes now emit one light level less compared to full nodes to make up for their smaller visual size. -- The minimum supported Minetest version is now 5.0.0. ### Fixed From 8b10e0721e78799e2abe64eb0c8625485577d49b Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sat, 15 Jun 2019 18:14:46 +0200 Subject: [PATCH 3/9] Fix a placeholder in the Polish translation This closes #143. --- locale/pl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/pl.po b/locale/pl.po index 237e5eb..aedc07b 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -286,4 +286,4 @@ msgstr "%s Panel" #: stairsplus/common.lua #, lua-format msgid "%s Stairs" -msgstr "% Schody" +msgstr "%s Schody" From 719494b6c447c1e199a695d54e25554ccf4508e1 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 19 Jun 2019 21:17:39 +0200 Subject: [PATCH 4/9] Optimize PNG images losslessly Commands used: - `parallel optipng -o7 -zm1-9 -strip all ::: **/*.png` - `parallel advpng -z4 -i5000 ::: **/*.png` --- textures/moreblocks_clean_glass.png | Bin 176 -> 170 bytes textures/moreblocks_coal_glass_stairsplus.png | Bin 165 -> 163 bytes textures/moreblocks_copperpatina.png | Bin 306 -> 258 bytes textures/moreblocks_dirt_compressed.png | Bin 292 -> 269 bytes textures/moreblocks_empty_shelf.png | Bin 219 -> 207 bytes textures/moreblocks_glass_stairsplus.png | Bin 170 -> 167 bytes textures/moreblocks_glow_glass_stairsplus.png | Bin 169 -> 167 bytes textures/moreblocks_iron_checker.png | Bin 850 -> 739 bytes textures/moreblocks_iron_glass_stairsplus.png | Bin 169 -> 167 bytes textures/moreblocks_junglestick.png | Bin 121 -> 115 bytes textures/moreblocks_rope.png | Bin 356 -> 352 bytes .../moreblocks_super_glow_glass_stairsplus.png | Bin 170 -> 169 bytes textures/moreblocks_trap_box.png | Bin 135 -> 88 bytes textures/moreblocks_trap_box_glass.png | Bin 153 -> 117 bytes textures/moreblocks_wood_tile.png | Bin 389 -> 387 bytes textures/moreblocks_wood_tile_center.png | Bin 282 -> 281 bytes textures/moreblocks_wood_tile_offset.png | Bin 284 -> 282 bytes 17 files changed, 0 insertions(+), 0 deletions(-) diff --git a/textures/moreblocks_clean_glass.png b/textures/moreblocks_clean_glass.png index 73febdb6aaab6cd7a98f587a27d68d6993ff0be6..b7669560f98a7c30c68403a99257dde75c15b485 100644 GIT binary patch delta 99 zcmdnMxQcOt1SbbG0|SGGE`RVuMJsgTe~DWM4f D`|%tL delta 105 zcmV-v0G9u%0k8p(7zqRe0002(-QrS_Av#q+NklPyo(*T5ny&(hu0000< KMNUMnLSTZp@h0s6 delta 106 zcmV-w0G0ov0i^+u7zqRe0002(-QrS_Aud)yNkliMFGG748)Sb|LS0p>fg+m z%5b5o+_MOH M07*qoM6N<$f;rAB=l}o! diff --git a/textures/moreblocks_copperpatina.png b/textures/moreblocks_copperpatina.png index 1216d8d81e939270701560ce10cd655c2c8ce7db..d4e98b009373c97781d4b42b61e24d2415165ebb 100644 GIT binary patch delta 183 zcmV;o07(C`0)hgN7zqdi0000eEe}(XHa~xjNkly{j_V>3=YI-rM;K;YA&oIoapBgxlZpI3IB%g3CjQg002ovPDHLkV1gaxPvZap delta 231 zcmV-7#;)z0002(-QrRJ000SaNLh0L01FcU01FcV0GgZ_ks&{S0b)x> zL;#2d9Y_EG0GmlfK~xCW0gwQ1{{R36LT~~A16BYG`mE2)uFtms8m;R3|El__04luy zs{Z?|@Bj>|&HAmbs?q=|{jK`C+^e7fO0KP||EkKz0E)cot=j7D#Q-hKs=vOh%eDYI z>#Dr_&-(TNI{Lf6uKLgR0E((Uue!_Ht=0e!zrCu>?#ihEJ^HMzz0a)a05AT(?5(Qr hp#XU)A~Q0OQ7}B8R1b)Q{u=-Q002ovPDHLkV1nkGYVrU8 diff --git a/textures/moreblocks_dirt_compressed.png b/textures/moreblocks_dirt_compressed.png index a3072020f870bd0399f93a1fba7df7dc4513ba95..bdc8220d4f71f5d8ff957df67b71e931f5ff70a6 100644 GIT binary patch delta 181 zcmV;m080O)0*wNYB#}8kf0ao@K~xwS1;K#f3OiDlteS79Y5;r3G_I;4egci36&3aECa${K)H z_-fjnb+Y^zL1*@mK#f}8sN&WZ$6_lPuD9FA5ah!fwSwK$fRq%_EBft}5ZNCoq!-@a jYabw=C>L68wG62KeGv$J1QgC#00000NkvXXu0mjfSf^5Z delta 202 zcmV;*05$)O0;B?vBoYa5NLh0L01FcU01FcV0GgZ_ks(5Vmq|oHRCwAIO9x^EK?w3P zBOvN#|Nq$(yOf}()I@{2C51BGgVT9FCK*LR*K}JusqlykUe)evR(SS6Vp;gEtFV%j zaQmqd9nwO$JM64>1^&%aWeq?pd^PPq_GI}ng3jzAff}{GqKaEv9E+`FxZZ9bLy!+| z)CzV}15#2gKs@Fv>$EVt5K#T12*8uK$kCOD1?}7~m@6 ruIn$~j)8{jB0{!bu$+7Ba?Vy}S)c;M9AfV)00000NkvXXu0mjff~q?~ delta 150 zcmV;H0BQfv0owtP7zqRe0002(-QrS_Avu3+NklG+4#Zic1!bL$4kYWf;1A|nC?d7G-#>U272y+g=vG*BQVmp6jbyOs2@MU6=&%F;i(D9EYOU|r00000NkvXXu0jG} Ef)ZjkWdHyG diff --git a/textures/moreblocks_glass_stairsplus.png b/textures/moreblocks_glass_stairsplus.png index 30aadfbb555b6db09afff5ed4097e1b545f07f28..8e4cb98dfe1dd38eb93d9ea35c709002f4f54f26 100644 GIT binary patch delta 92 zcmV-i0Hgn^0jB|wQdK}nL_t(|+I0^D0RS-U?%(*HZKr(UD6rCn4B8E}Yor08%lR<1 y)YsBqkSdQdYmMcuJvOACDrRkmG=uOLvvvVVCjf+!LtHli0000=(Av+G{>}=~SE+>QIGg~>o^8c1O`v6HN0EDTRopb;I002ovPDHLkV1mE- BC|&>n diff --git a/textures/moreblocks_glow_glass_stairsplus.png b/textures/moreblocks_glow_glass_stairsplus.png index cdb804436943280ac37a9e14ade2ea6854be2980..db2831e5281235085696df7b14da9f35eb5d85bd 100644 GIT binary patch delta 105 zcmV-v0G9u$0jB|w7zqdi0000eEe}(XAu&}zNkldRq09L&wba+rUyv$~GHZ?Hu01xSo+@T-hctum7qfN&Nhbh=l0#fK00000 LNkvXXu0mjfAL=Np delta 107 zcmV-x0F?iy0jU9y7zqRe0002(-QrS_Au(4%NklUHrW)R*7!#ZOA$1Y*d#KNSD~ N002ovPDHLkV1j#nFG>Ia diff --git a/textures/moreblocks_iron_checker.png b/textures/moreblocks_iron_checker.png index d27f4df7646c69e299211b8bb8327eaca309fe19..117cac2da6c435ef03450b10b027100751dc3047 100644 GIT binary patch delta 716 zcmV;-0yF*62IB>gBYy&_Nkl%E9^hIYvfCu)e-7_o-Bh9A*c_Vo{36qck-&g^i63?C$PjWn~4)WRkeX>-Cb) z=Ogs>^+BuE$^ey0g?Kzp^?F?nzMr3;$KAVk(b3U?YuB#HfPZqitQ;i@hr@)Po*pbM zEeXon+8VrG|9^yZI!&jir`X=!Mt^@l#>dAIi^S;jr_U4&29+Z~7#kat4-X$c#N6B* z3WXeHG8y{z?Yj(^o}NZ~dppaNBb`k0cScua#z-hJ)m$z|`Fvg)^m;wiYBjdDw!rT_ z9xp|sQ7RM)#D6T$&d$JfGcz*)qo~y?a=M(v!&nY`VltVqxVQ*z^80)u>GkUu0&wfr zEn%~{xe2&jE-IBuBna6ou_rfg-UMGcfp{z~&32nzC?6diiJ>=c+(2h%C-CCw3kroo zG9-~mkb-=LX)^up?r!lUkxYo@pTB-dto!@>xP1At$bZ1_@UX;pcz6hp$0M3~U`mnZ z^La_9)3G1C1Dp~|Qh-uY!^|YUg@pwi92{V9a1ix+P0$<;4{@M#*S2{&$=iy4`LnDmAfqjO-2v!C){*Y$qot zyb~O&Ab(V=Rf&}oVbgBkzKzw@RWzGTvODb*3qATV=A}};L^hjE!dqrNhdZjKb2L=Y%cwT=25z_*JfD)I6 yxR^ikg78no(UnR?VOFcxl-S$?z;Uuvj`ufAH%-V}=Fi{&00001T delta 828 zcmV-C1H=5|1=0qPBYy)KNklLNJ+35JDi;>vhWIGJgP)B;or$pMLqo(o!0b zkY$-hqd~LTq+YKBpsFglTozfDk%Azg+wCHRz%)(X-(4n?3Egg&Xf#SLmt%W-8%0rA zU0ubW`Q&qXhQn8az(tYy-NRq_y@vi`MyIsD2|Bfun_`Z)UM|k}C zh$KnK@&e-G;(sCxf&fKP5JFI?RK(`yCiD56(P+f}{(d+dzM`rzG)<#gt%_7CMW@sG zFpwmPcKavKFVA?MhoUI_H|RJHk|Yt41g`6nPA_8HHnm!f>2yjmnI!u9`pVW;naN~= z5{)t#47k0$Mb~w7UB`KM2*MC=>d|iZ$mjEzrpeRO6MwdCBYoNU!e}%inM~r&W*i~Jw5&C zCzV>lb3KxaNpkrdLI?m1!=O|u5sgHN$Kz-*jbgF*KX|QHqgX5=MIsU2>^Gcuo1r;m zHZ_}3sZ_8m3(K-dBs3hyA&i8W<}<}&kst`jWHKZY3H|~1YdRq09L&wba+rUyv$~GHZ?Hu01xSo+@T-hctum7qfN&Nhbh=l0#fK00000 LNkvXXu0mjfAL=Np delta 107 zcmV-x0F?iy0jU9y7zqRe0002(-QrS_Au(4%NklUHrW)R*7!#ZOA$1Y*d#KNSD~ N002ovPDHLkV1j#nFG>Ia diff --git a/textures/moreblocks_junglestick.png b/textures/moreblocks_junglestick.png index 23644fd1c842294d0418d2972ff9bd0797c265a9..7bc6bc442562389e9b17ce667da1106e8de4b41e 100644 GIT binary patch delta 63 zcmb;{o*===!OXzGprOkjJW)|qSHjc9F{I*FvI4Jx;lhuSlI*7Q8BeHlGB8M4Gw7S_ SkthbLW$<+Mb6Mw<&;$V4s}E`b delta 69 zcmXS}oFKu;#LU3JkTh5P(?ms8V>wS3$B>F!$qtO%4Kp+uJPNEBI725~5OH!^qoKyY YuyQ{0%X0$Z{6HNHp00i_>zopr0H@g#;{X5v diff --git a/textures/moreblocks_rope.png b/textures/moreblocks_rope.png index 19787fe5b4134593c96f5c8e1bffb64f0eacd3fa..f86c07dcee3f341228652eca704a148ddf8a789e 100644 GIT binary patch delta 129 zcmV-{0Dk}E0^kCW=6YpGL_t(|+C{;G6~q7lM8SWytvy?D`tK~yI|Bd$h_H0uyR*d9 z>a4%Qt_)5)VFwl()-g?J=fd8%3p6qDKlX)%e7fZd_JA2xOyl^8FinHsc7zFD2-Cc= jL6}Igv#=7>Rsx^^RCx#?5=+aS00000NkvXXu0mjfkA6BQ delta 133 zcmV;00DAx60^|aa=6-2OL_t&-8AZWY0>J+dzjLrq+FnFvXYCxQPjN n2vfH>LYR2G7Q!-+ABdk1RCx#?wSfba00000NkvXXu0mjfmF_uj diff --git a/textures/moreblocks_super_glow_glass_stairsplus.png b/textures/moreblocks_super_glow_glass_stairsplus.png index ae3f01fbd97e15bef989bff037b8277270c1a048..c9a2da6ef20bd55caf67e3bcfa7da42c39a2cb49 100644 GIT binary patch delta 107 zcmV-x0F?i#0jU9y7zqdi0000eEe}(XAu(4%NklX`zGmA4 z1y=b`QRjj2jj}KVTpvqIhn5LJH^Z%sR=W1tlmgYl+DU1K_zUT{_5exR0EMfAeW3sV N002ovPDHLkV1n&2DW(7b delta 108 zcmV-y0F(cz0jdFz7zqRe0002(-QrS_Au(7(Nkl#ag5%BO|F(3;NVnjl3n1$!&#gCBokC-4~dhk&QA09Z|7vBI&KLle{U{%-v O0000@AU6BYmf delta 105 zcma!OXPlst%u?*+8NvYsH5@4&3=9mM1s;*b3=DinK$vl=HlH+5P}9@JF~p)bd5+D^ zANI_u4MNOn{$~HqyG(q`!^5+ftw+iri-E-;Xx3cDiDI0!eilF_k+N5T#fno zS(|kj(=)hlLQt9MXP~~Si(ei>!UUmm(jmOAtLvhOAwo>iUy&OSU$J3WNs>T(u!5;+ zkr6={RaN~XszR9aUAG4i2|}pvsRUte-GdJyQgR&IVndi+-ydG;%0ELd_j UmIS%La{vGU07*qoM6N<$f|{;N7XSbN delta 168 zcmV;Z09XHm1BC;S<$sGwL_t(|+Fi;6vcq5i0O8p7V}HbU?tikn(T=}a!nPg9GE9m1 z^fMM?(}o*R-w1&;k~aW#mM6dT3LHcLq}_H{Rh8#S;;-OB4E~Z>S>el96fFn>;vC7S zlH@7g3QCq`{{V|CsQtZac2)=g0CkPI?U<@Z_6jUU%Q6l6b|F-CdC4<-13}<<+ZJx8 WTn?7Bj(>yQBG>lF0b!D4F zWdA5nLXhI^Kakf(g6bDFCJ3q2{$g^@7%8`3te7GwMfZzi>$-m5_u{@m1OVKb1lRr9 R7o-3H002ovPDHLkV1izhGsge` delta 113 zcmV-%0FM8f0-OSnvT9XHL_t(|+C++j6+}S*#J=sdz5RE1#yn1v;<UeqhBEK`FW)IJU0q_kAz!8$ From b934d8ad4d6c4040afb469ee0977f81ee49b717f Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Mon, 29 Jul 2019 00:28:51 +0200 Subject: [PATCH 5/9] Travis CI: Use the `bionic` distribution --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1c4c0d8..211285a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,15 @@ -language: generic +dist: bionic +language: python -addons: - apt: - packages: - - luarocks +python: + - 3.7.1 install: - - pyenv global 3.6.3 - - pip3 install --user pre-commit + - sudo apt-get update -qq + - sudo apt-get install -qqq luarocks + - pip3 install pre-commit - luarocks install --local luacheck script: - - $HOME/.local/bin/pre-commit run --all-files + - pre-commit run --all-files - $HOME/.luarocks/bin/luacheck . From 873019176bde413f3f368b448e06a42a5218686b Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sun, 8 Sep 2019 22:55:45 +0200 Subject: [PATCH 6/9] Document the Minetest 5.0.0 version requirement --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 45b5af6..b7bd21a 100644 --- a/README.md +++ b/README.md @@ -60,9 +60,9 @@ on that line. ## Version compatibility -More Blocks is currently primarily tested with Minetest 0.4.17. +More Blocks is currently primarily tested with Minetest 5.0.1. It may or may not work with newer or older versions. Issues arising in older -versions than 0.4.17 will generally not be fixed. +versions than 5.0.0 will generally not be fixed. ## License From 8019f9f3093ab3fac1d8f10d6805cb9cf8f5b2aa Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 25 Sep 2019 23:07:07 +0200 Subject: [PATCH 7/9] Update pre-commit hooks to 2.3.0 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9c72498..f9254a4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.1.0 + rev: v2.3.0 hooks: - id: end-of-file-fixer - id: trailing-whitespace From 5cab63c675c22b6cb165c34544cc2a118383abd6 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Thu, 17 Oct 2019 22:25:30 +0200 Subject: [PATCH 8/9] Add ice as a Stairs+ node This closes #109. --- CHANGELOG.md | 1 + stairsplus/registrations.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 217536c..81b65b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added +- Stairs+ nodes for ice. - `settingtypes.txt` file to allow configuring settings in the main menu. - Polish translation. diff --git a/stairsplus/registrations.lua b/stairsplus/registrations.lua index 189ca84..3caab34 100644 --- a/stairsplus/registrations.lua +++ b/stairsplus/registrations.lua @@ -49,6 +49,7 @@ local default_nodes = { -- Default stairs/slabs/panels/microblocks: "desert_sandstone_block", "sandstone_block", "coral_skeleton", + "ice", } for _, name in pairs(default_nodes) do From 325999f8483226d5e3cb879f155c2f4a64d7accd Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Mon, 25 Nov 2019 13:43:10 +0100 Subject: [PATCH 9/9] Bump to version 2.0.0 --- CHANGELOG.md | 5 ++++- README.md | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81b65b7..fd5cbb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [2.0.0] - 2019-11-25 + ### Added - Stairs+ nodes for ice. @@ -88,7 +90,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Initial versioned release. -[Unreleased]: https://github.com/minetest-mods/moreblocks/compare/v1.3.0...HEAD +[Unreleased]: https://github.com/minetest-mods/moreblocks/compare/v2.0.0...HEAD +[2.0.0]: https://github.com/minetest-mods/moreblocks/compare/v1.3.0...v2.0.0 [1.3.0]: https://github.com/minetest-mods/moreblocks/compare/v1.2.0...v1.3.0 [1.2.0]: https://github.com/minetest-mods/moreblocks/compare/v1.1.0...v1.2.0 [1.1.0]: https://github.com/minetest-mods/moreblocks/compare/v1.0.0...v1.1.0 diff --git a/README.md b/README.md index b7bd21a..6ca4aa8 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ on that line. ## Version compatibility -More Blocks is currently primarily tested with Minetest 5.0.1. +More Blocks is currently primarily tested with Minetest 5.1.0. It may or may not work with newer or older versions. Issues arising in older versions than 5.0.0 will generally not be fixed.