From 70c2c8b489661ca904ad34ca9f6208babfeec25d Mon Sep 17 00:00:00 2001 From: Joachim Stolberg Date: Sun, 6 Jun 2021 11:47:26 +0200 Subject: [PATCH] Implement improvements provided by SciFurz --- README.md | 35 +++++++++++++++--- releasenotes.md | 16 ++++++++ tubelib/textures/tubelib_distributor_blue.png | Bin 488 -> 4292 bytes .../textures/tubelib_distributor_green.png | Bin 499 -> 4044 bytes tubelib/textures/tubelib_distributor_red.png | Bin 480 -> 4029 bytes .../textures/tubelib_distributor_yellow.png | Bin 479 -> 4061 bytes tubelib_addons1/nodes.lua | 7 ++++ 7 files changed, 52 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5bff2a9..03d9851 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# TechPack V2.05 +# TechPack V2.06 TechPack, a Mining, Crafting, & Farming Modpack for Minetest. @@ -27,6 +27,7 @@ TechPack is a collection of following Mods: **The moved/copied nodes will not have valid node numbers, which could lead to a server crash.** TechPack provides: + - lumber tubes to connect 2 nodes - a Pusher node to pull/push items through tubes - a Distributor node with 4 output channels to sort incoming items @@ -64,9 +65,11 @@ TechPack provides: - a Display node for text outputs of the Controller - Metal ladders, stairways, and bridges - Warehouse Boxes in steel, copper, and gold +- A chect cart for the mod minecart TechPack supports the following mods: + - Farming Redo (Harvester, Fermenter) - Ethereal (Harvester, Quarry, Fermenter) - Pipeworks (Gravel Sieve) @@ -75,12 +78,14 @@ TechPack supports the following mods: ### Configuration + The following can be changed in the minetest menu (Settings -> Advanced Settings -> Mods -> tubelib) or directly in 'minetest.conf' - Maximum number of Forceload Blocks per player - Enable Basalt Stone (and disable ore generation via Cobblestone generator) - Machine aging value to calculate the lifetime of machines Example for 'minetest.conf': + ```LUA tubelib_basalt_stone_enabled = false tubelib_max_num_forceload_blocks = 12 @@ -88,6 +93,7 @@ tubelib_machine_aging_value = 200 ``` Example for a v1 compatible 'minetest.conf': + ```LUA tubelib_basalt_stone_enabled = false tubelib_max_num_forceload_blocks = 0 @@ -96,24 +102,30 @@ tubelib_machine_aging_value = 999999 #### Maximum number of Forceload Blocks per player -Default value is 12. + +Default value is 12. I higher number allows to build larger farms and machines which keep loaded, but increases the server load, too. But the areas are only loaded when the player is online. To be able to use e.g. 12 forceloaded blocks per player, the pararamter 'max_forceloaded_blocks' in 'minetest.conf' has to be ajusted. + #### Enable Basalt Stone (and disable ore generation via Cobblestone generator) -The lava/water Cobblestone generator allows to produce infinite Cobblestone. By means of Quarry, + +The lava/water Cobblestone generator allows to produce infinite Cobblestone. By means of Quarry, Grinder, and Gravel Sieve it allows to infinite generate ores. This can be disabled by means of the setting parameter. If enabled, the Cobblestone generator generates Basalt instead, which only can be used for building purposes. + #### Machine aging value to calculate the lifetime of machines -Default value is 200. + +Default value is 200. This aging value is used to calculate the lifetime of machines before they go defect. The value 200 (default) results in a lifetime for standard machines of about 2000 - 8000 item processing cycles (~2-4 hours). ### License + Copyright (C) 2017-2021 Joachim Stolberg Code: Licensed under the GNU AGPL version 3 or later. See LICENSE.txt Textures: CC BY-SA 3.0 @@ -121,26 +133,33 @@ Textures: CC BY-SA 3.0 ## Credits + ### Contributors -- oversword (PR #43, #57, #58, #59, #60, #62, #68, #74, #76) +- oversword (PR #43, #57, #58, #59, #60, #62, #68, #74, #76, and many more) - afkplayer5000 (PR #70, #71) - andrenete (PR #37, #66) - fluxionary (PR #27, #28, #30, #31, #34, #54) - Arigatas (PR #51, #53) - realmicu (PR #6, #8, #12) - theFox6 (PR #3, #4) +- superfloh247 (PR #89, #88, #87) +- SciFurz (via forum) ### Dependencies -default, doors, intllib, basic_materials + +default, doors, intllib, basic_materials tubelib2 (![GitHub](https://github.com/joe7575/tubelib2)) Tubelib Color Lamps optional: unifieddyes SmartLine Controller optional: mail Gravelsieve optional: moreores, hopper, pipeworks tubelib_addons1 optional: unified_inventory +tubelib_addons13 optional: minecart + ### History + - 2018-03-18 V1.00 * Tubelib, tubelib_addons1, tubelib_addons2, smartline, and gravelsieve combined to one modpack. - 2018-03-24 V1.01 * Support for Ethereal added - 2018-03-27 V1.02 * Timer improvements for unloaded areas @@ -166,8 +185,11 @@ tubelib_addons1 optional: unified_inventory - 2019-04-23 V2.03 * Piston/WorldEdit/replacer detection added, farming and grinder recipes added - 2020-11-20 V2.04 * Switch to AGPL v3, adapt to minetest 5.3, add translation support, fix minor bugs - 2021-01-24 V2.05 * PR #74, #76: Implement checks for valid connection sides for many nodes +- 2021-06-06 V2.06 * PR #78 - #89, chest cart added + ## New in v2 (from players point of view) + - Almost all machines break after a certain amount of time (switch into the state 'defect') and have to be repaired. - A Repair Kit is available to repair defect machines. - A Forceload block (16x16x16) is added which keeps the corresponding area loaded and the machines operational as far as the player is logged in. @@ -178,6 +200,7 @@ tubelib_addons1 optional: unified_inventory ## New in v2 (from admins point of view) + - settingtypes introduced with the following settings: tubelib_max_num_forceload_blocks, tubelib_basalt_stone_enabled, tubelib_machine_aging_value - the new mods 'techpack_stairway' and 'techpack_warehouse' have to be enabled - TechPack depends now on the mod 'basic_materials' and 'tubelib2' (![GitHub](https://github.com/joe7575/tubelib2)) diff --git a/releasenotes.md b/releasenotes.md index 7a5e424..6df84b6 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,6 +1,22 @@ # Release Notes for ModPack TechPack [techpack] +## V2.06.00 (2021-06-06) + +### Additions +- Add chest cart for the mod minecart (optional) +- Add support for the mod "underch" (#88) + +### Removals + +### Changes +- Account for new red & yellow pepper varieties (#86) +- Pusher improvements (#84, #83) + +### Fixes +- Fix crash with "ethereal:strawberry" (#89) + + ## V2.05.00 (2021-01-24) ### Additions diff --git a/tubelib/textures/tubelib_distributor_blue.png b/tubelib/textures/tubelib_distributor_blue.png index f43e2b672c8d50a8e778ab190858853e51490822..ae941b53b361e67af2aaaea70ac5b9ac07111e2f 100644 GIT binary patch delta 4222 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 USTo^@@c;k-07*qoM6N<$f}&&tJOBUy delta 394 zcmV;50d@YwA?O2;Ba`k9F_SD08-L;q0uu!v7QWFs00043NklJa}tFFdn4{7qS*%3|*WCQ=HKR;TI@{jvh=#yC#oN3K_fR0 z2jW2>`qEbl39cxGWhasWODReb^epJXJE$;c7l9XPe=i3mfCvHvDWymOfPXTs+mnuJ zV_!oVFbmT9`F8tpfH4q)>!%T9QS35yInUBf7Hzl#-X4;kXV;=Q9*eIcZj!-v<=N}| z7;kZdzMaFf?>ksfP_p{Z_=sC8#5KK_RJ$CKZdOtyJt*W;NrfxB1lLmr0x-h$)MM+W z%z;7(_p_45dx2nxW?=aVjC&eA2}1@5W)kKA5oT)I3TdSqT^x(6-Tzv*&X3OM^GUaL zWvxxE9|Vj}EjW!pIp2+Qy{+AsG74*UoU4ZcD<0 oy)9fY-2dH{SgVCttQolY1p*I{meU$kp8x;=07*qoM6N<$f*O0Q&;S4c diff --git a/tubelib/textures/tubelib_distributor_green.png b/tubelib/textures/tubelib_distributor_green.png index 92e92769e2d8312593ad549960fd9e35388e01c1..70ea1f5c9cb9933394b9f0eecc5576e6ef0430c8 100644 GIT binary patch delta 3974 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 delta 403 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 P00000NkvXXu0mjfkHoEB delta 386 zcmV-|0e$|xAK(L!Ba`zDF_SS48-L;q0uuua#9B9E0003`Nklb>k7={0# z7wA}Zsc=pZa{|K|;>ez3N9i0u&TK$r>KJuRVuYs-Zk+gX#cn0jf8*184|qS=t!1ie zcFr*)3nAc`+BQ>NV>^3Tu|o>=!|i*PTbW-sJ+FIkRv2rvk%9{)w1%>z2!AJt5{hVo z%Mv)JXhGfpo;<{ifwCbGC0u$Bl87WUA_UhrXj2-UhT(o6J_mx^43wbJ*Yh;51j`+0 zP0_~;w%{6y{uD0+mwF1FEth@_4J>U6PKFl6z{pUcH1I0SIE(NW51fMiEwt3%aL8tm z;NuFo_;*VQN{1P;0Apv6U~}6{Pap2X$^ZYfT#S9J35u5pld;-`@56}LH|7r`h@1fJ zfp0zbia3eb7K$=Pkq5~H&IMR)r7*4$+FGrq-Co;_ch_BaeqaCYw%R{f-sqffZfx4E gQI(goqR`{~0M&!C%Z6RA?f?J)07*qoM6N<$g2k?}N&o-= diff --git a/tubelib/textures/tubelib_distributor_yellow.png b/tubelib/textures/tubelib_distributor_yellow.png index 0573c7d2f4f45096ad18ea14f4f3ac4e3e560dd0..b09fc18812eca469b2dd8e023ec31ddb13b813ca 100644 GIT binary patch delta 3990 zcmV;H4{7k<1Kl5xBYzB3dQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+O3&sk|Ze( zh5vJkIRcwlj>Br!H<;tkC-BIOtjb#2Y%;oHamPXENl#C-S^xcKoB!|^lJ_P`E~%zu z`HMAH-}qAO{j2BQ*?8X1pMP%g`^$Cnal>;d@EPvU+@A4`>woh3z-tZHzg{=xx#P<- z(R1T9VbGOzwfSx&*ZsZj;xkcQ_e-iJznj`0Q^zy#nDYD!`R?#FiT*b47h=XsQy3Mz zU%>@?-pjQh=sy=4pXt6c&Ydeh6vIbg#%l=<`Ley&r?u}6`r_o*H}j+SKfe9oeBYky z;Rj!)$47km_J4+x@11{K{I+oTu*iSCvGMOu+j;)&J?se9e|nPD*kuha9uylyfe*=2k+9 zMM^5Ulu}Epz6Ll@YO1-GT5D_GG!|;i)fnHn(tQs-cIm0-UV80q5I!Rg8ENEEMjdVX z874F_)6BEXI@@w)!4xYlS!v}}R$XlqYdh??Wq+rgciDBf57Zu1e|r53)ZBxbKS=4g z{DB%*P0p_=oYILXW+3LH1M#c~5YS#Rv&F^e6*rh$4F6Z%yfzv5XR-aZ1;iP zCvty{~0fI*pU*X0GhJY;0Iq z;eS?<*yfRkv;a}@mU&+^v%k>xMo6^ zSbSS&KGL{P+rpZDx7kK=!lr?cJqAp}-qyI;cFdDm7(F_HmS;1vqit#-V}_ljX9AVY zy-k`vC*5~aUm4Uv6SMpUz#IhBPt3}seuyG8lfYZ-bQ4pn=3axOy79bgTk73DQ-362 zOVeV6shPwOzj&~!F%+xXb;(5-^k(rlTi^r4b`yd|A=zPe(qnZ(vnxQwut3Ka4P>H+ zRnNR#cRGU(Dn6z?2o+Lo$Iuoj*cOwny>s4(l?~3zq!UD#ItcMOmTo(%TkpG`OAC}zfUp!%*S;2*Kc@Z#(@LbtYcVOta5%t>l7^h zgN%}6^%J_#Tuz<(WWXaQ(hS3NHKK+}S14pnLu8KB2Y)++-3qMG`

9(ti&FR@}Yv zkcOAh_^NWUm3+uGY*I0A5YwC*wWEhz$)Glv2xfv)Qp5+Fcw#WjuveVhFgj?+#E2BpFo29>u zcGt>jE)k}i4TtG7qp(?$@RO9|Mjeo)vH+aHBC#sRYp%-FW zzqc~&)?#9@p^+skDZ`QHGHymhf9TK~x~KEycb}hAWJ+)d2qIk>cyUsNhJQlM?F2`X?{xjPX zPw~4P{eO2zn%|}9Pf&V=lIp0(OY;*<3iLMf(Lt(qs6Vz-Gmr~(TcUd^^f=18l}>Ao zO<)d>Z1r=xNBtu0HJr_{!@2UQed;eE{vE>Rj}Sx6x%hb~`8NQY4}`Tv(86|vC{0m$ zRJfb`L_n!u?{cXUQ1IXlJK)91`&RC&{-X@4rKxIEHc+dVc`$Ig0AbP2c=MCNzA zq-28hyR;M(rF(6prsrDn{KVMjCPY@g-1;)o{PM{Y1@1h%DA-oJ8Tr7!J@_BlY3Wi8 z^h4{1g5C3!sE;NlYn^_zM)J|Mc@-^;(iU*86|@Q0ZqK~c`*G^MKDr8RFJfiWMIH~^ zhkrcM>0^+zw4d60z67;xhL}Bg1njOC^r3dUBd}9-9?20@qpEaPy_OEW|EQeJchXr4 zY`^{M3RzkF8}0mqayDP3GZFYMp3hO(->GNw2l;%|Guq~|FYi$m>lLZIJG;D7HC>Em zWJy5}FXU+s`F7fvM_&+#{!yhwhYAe8P=8hm$ELr%I!pBQcxb$9kLPHT4tyWb-OzHnWP=3LS zNM%tMqk^{z+g*HeL=Y2xif!M*)_pPVh;5bH!$2to)rl%sE803Cf)QDlCJCVtjem}W zSViQoM07OrJRg5NIZTZUrlEK*OZoWI9&dUvV5FhPIOo_zTX69cya@EV;BzhNMm=01 zRGM@>ohXM>SVu{xKg|sjL~;R{eOv6K98?{Xa_vbu<)d?Qpc#73ZO9v%7)5kk^}rU< zBJ*(2t8wyrEHY93fkM?a<&7#Zb$`Bl<+CG6Pvhk8yj@ji9C%k%`_VUHw9}=~=kHt= zxyD2lnv`4Z6AW!5ilx+~A&2b(Wc##3bcfRfiO0TG&~z zE8B$|VV|pyxYD5@_>67Rd8p*2O-kC8;HYyD_Z{ zO1QUEg1P{_tJKg_n-4slBdPGd>WOl+RzH+_$UmPWfY&JnR8!CSk2XfyMe1RsHehfE zO%xMzPbi4$`lKa5E507VfPb3y&yZcONo97aLrx>AXG#}Mt$c`6iAoVr4Hm|J4ikw` zRR@Zr(Mjgq1Crl2F7zlwD{L=ujc)b1r8JF)DKJL|(7sv)P7j_~hK2MT@^DRl>w?rj zVDNSxMM#GH`x6}V-4V_=CpdfWS0dehQ5?-Pev zQBsJ{iAN2(An_yDWtZPL7aaEU%&?J8%@c=-g+d$4ZOn>>N<2jzRaA}g{TY`P&Rd+- za+Njj$zK@CX)DWIr!|BG7O?~o0%TNCLKzlfv}>f8NYQ!R!+$^M_(gKbI{4GzxVW@1EV94pL;Ei-jQU4dB6)FCC1wIeTA zCsc}in?K$E-}yhV8!J>%Z=DmS%A|zD(l&`|YunoWLhP4N-rcSfsjbq>y35NBoR!8J zZ7P{dCA9|58Nz=AG0G4lm~+T;hGz8b@%Zr&3jxZ8Kyo;D9*~F<7Ey}JD>O?M9sB-v z>py#nn*@|((HD&MN^!LXtr_~5zy@5+&|k+3#axf3ljPhDrh%kcf~!J_5@4#ZLuts1 z(BmY-DIPclyK5*ZzhR$DfZ)Rda`|rx2c<)gDg$FDK(KPH$JP5=fAs%9&Syg&D~jSd z!gPps=JPNz_KA%VViGwC+5`LqF^R+mG9IId_y-%nDFdr*C5@}4wpOe0wwET!+sn2+ wy|13PEp~U2);i7CS25n!sKU34EYm~%0!Hqb>l2~he*gdg07*qoM6N<$g0=g}j{pDw delta 385 zcmV-{0e=47AKwFzBa;*kF_Tgb8-L;q0uu)UM~>fN0003_Nkl6{>8u z&IwcJQo+G`bi>e1_rLjhvS{71Ct$}lfFn>XeGQ-#fNL1~Q#?`3^%Oc=&ixn~SlR?!9a@wCQ-=zrp(w+QlMHY1z$w^WLre7q`*a2b zA6}u5|8C)+beK`+VC)PCwsOt%^x-xf{r`{4#n{J+qIiig9jjgVK8%cgWBxFL$Vt#1 z_|{{uh)E