From 279776ff62951a8a9ab96b86b03b7558e77a1c87 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 30 Mar 2013 11:36:45 +0100 Subject: [PATCH] update --- technic/depends.txt | 1 + technic/grinder.lua | 2 +- technic/init.lua | 6 +- technic/items.lua | 25 +-- technic/mining_laser_mk1.lua | 2 +- technic/music_player.lua | 2 +- technic/textures/technic_brass_dust.png | Bin 464 -> 0 bytes technic/textures/technic_brass_ingot.png | Bin 456 -> 0 bytes technic/textures/technic_chromium_ingot.png | Bin 242 -> 0 bytes technic/textures/technic_chromium_lump.png | Bin 213 -> 0 bytes technic/textures/technic_concrete_block.png | Bin 500 -> 0 bytes technic/textures/technic_granite.png | Bin 947 -> 0 bytes technic/textures/technic_marble.png | Bin 807 -> 0 bytes technic/textures/technic_marble_bricks.png | Bin 959 -> 0 bytes technic/textures/technic_mineral_chromium.png | Bin 887 -> 0 bytes technic/textures/technic_mineral_diamond.png | Bin 904 -> 0 bytes technic/textures/technic_mineral_uranium.png | Bin 912 -> 0 bytes technic/textures/technic_mineral_zinc.png | Bin 891 -> 0 bytes technic/textures/technic_obsidian.png | Bin 616 -> 0 bytes technic/textures/technic_rebar.png | Bin 813 -> 0 bytes technic/textures/technic_uranium.png | Bin 213 -> 0 bytes technic/textures/technic_zinc_ingot.png | Bin 242 -> 0 bytes technic/textures/technic_zinc_lump.png | Bin 214 -> 0 bytes .../technicx32/technic_brass_ingot.png | Bin 456 -> 0 bytes .../technicx32/technic_chromium_ingot.png | Bin 242 -> 0 bytes .../technicx32/technic_chromium_lump.png | Bin 213 -> 0 bytes .../technicx32/technic_concrete_block.png | Bin 2319 -> 0 bytes .../textures/technicx32/technic_diamond.png | Bin 693 -> 0 bytes .../technicx32/technic_diamond_block.png | Bin 2865 -> 0 bytes .../textures/technicx32/technic_granite.png | Bin 947 -> 0 bytes .../textures/technicx32/technic_marble.png | Bin 807 -> 0 bytes .../technicx32/technic_marble_bricks.png | Bin 959 -> 0 bytes .../technicx32/technic_mineral_chromium.png | Bin 887 -> 0 bytes .../technicx32/technic_mineral_diamond.png | Bin 904 -> 0 bytes .../technicx32/technic_mineral_uranium.png | Bin 912 -> 0 bytes .../technicx32/technic_mineral_zinc.png | Bin 891 -> 0 bytes technic/textures/technicx32/technic_rebar.png | Bin 813 -> 0 bytes .../technic_stainless_steel_ingot.png | Bin 230 -> 0 bytes .../textures/technicx32/technic_uranium.png | Bin 213 -> 0 bytes .../technicx32/technic_zinc_ingot.png | Bin 242 -> 0 bytes .../textures/technicx32/technic_zinc_lump.png | Bin 214 -> 0 bytes technic/textures/textures_here.txt | 1 - technic_worldgen/crafts.lua | 49 +++++ technic_worldgen/init.lua | 8 + technic_worldgen/nodes.lua | 58 ++++++ technic_worldgen/oregen.lua | 66 ++++++ .../stairslike.lua | 191 ------------------ unified_inventory/depends.txt | 1 + unified_inventory/init.lua | 11 +- 49 files changed, 200 insertions(+), 223 deletions(-) delete mode 100644 technic/textures/technic_brass_dust.png delete mode 100644 technic/textures/technic_brass_ingot.png delete mode 100644 technic/textures/technic_chromium_ingot.png delete mode 100644 technic/textures/technic_chromium_lump.png delete mode 100644 technic/textures/technic_concrete_block.png delete mode 100644 technic/textures/technic_granite.png delete mode 100644 technic/textures/technic_marble.png delete mode 100644 technic/textures/technic_marble_bricks.png delete mode 100644 technic/textures/technic_mineral_chromium.png delete mode 100644 technic/textures/technic_mineral_diamond.png delete mode 100644 technic/textures/technic_mineral_uranium.png delete mode 100644 technic/textures/technic_mineral_zinc.png delete mode 100644 technic/textures/technic_obsidian.png delete mode 100644 technic/textures/technic_rebar.png delete mode 100644 technic/textures/technic_uranium.png delete mode 100644 technic/textures/technic_zinc_ingot.png delete mode 100644 technic/textures/technic_zinc_lump.png delete mode 100644 technic/textures/technicx32/technic_brass_ingot.png delete mode 100644 technic/textures/technicx32/technic_chromium_ingot.png delete mode 100644 technic/textures/technicx32/technic_chromium_lump.png delete mode 100644 technic/textures/technicx32/technic_concrete_block.png delete mode 100644 technic/textures/technicx32/technic_diamond.png delete mode 100644 technic/textures/technicx32/technic_diamond_block.png delete mode 100644 technic/textures/technicx32/technic_granite.png delete mode 100644 technic/textures/technicx32/technic_marble.png delete mode 100644 technic/textures/technicx32/technic_marble_bricks.png delete mode 100644 technic/textures/technicx32/technic_mineral_chromium.png delete mode 100644 technic/textures/technicx32/technic_mineral_diamond.png delete mode 100644 technic/textures/technicx32/technic_mineral_uranium.png delete mode 100644 technic/textures/technicx32/technic_mineral_zinc.png delete mode 100644 technic/textures/technicx32/technic_rebar.png delete mode 100644 technic/textures/technicx32/technic_stainless_steel_ingot.png delete mode 100644 technic/textures/technicx32/technic_uranium.png delete mode 100644 technic/textures/technicx32/technic_zinc_ingot.png delete mode 100644 technic/textures/technicx32/technic_zinc_lump.png delete mode 100644 technic/textures/textures_here.txt create mode 100644 technic_worldgen/crafts.lua create mode 100644 technic_worldgen/init.lua create mode 100644 technic_worldgen/nodes.lua create mode 100644 technic_worldgen/oregen.lua rename technic/ores.lua => technic_worldgen/stairslike.lua (54%) diff --git a/technic/depends.txt b/technic/depends.txt index 94cbcf4..90f17c0 100644 --- a/technic/depends.txt +++ b/technic/depends.txt @@ -2,3 +2,4 @@ moreores pipeworks mesecons moreblocks +technic_worldgen diff --git a/technic/grinder.lua b/technic/grinder.lua index fac667d..13fcfc3 100644 --- a/technic/grinder.lua +++ b/technic/grinder.lua @@ -172,7 +172,7 @@ minetest.register_craft({ output = 'technic:grinder', recipe = { {'default:desert_stone', 'default:desert_stone', 'default:desert_stone'}, - {'default:desert_stone', 'technic:diamond', 'default:desert_stone'}, + {'default:desert_stone', 'default:diamond', 'default:desert_stone'}, {'default:stone', 'moreores:copper_ingot', 'default:stone'}, } }) diff --git a/technic/init.lua b/technic/init.lua index a05fe3c..e57c7a2 100644 --- a/technic/init.lua +++ b/technic/init.lua @@ -1,4 +1,4 @@ --- Minetest 0.4.4d1 : technic +-- Minetest 0.4.6 : technic modpath=minetest.get_modpath("technic") @@ -7,10 +7,6 @@ dofile(modpath.."/config.lua") --helper functions dofile(modpath.."/helpers.lua") --- world gen -dofile(modpath.."/ores.lua") -if enable_rubber_tree_generation==true then dofile(modpath.."/rubber.lua") end - -- chests dofile(modpath.."/chest_commons.lua") dofile(modpath.."/iron_chest.lua") diff --git a/technic/items.lua b/technic/items.lua index f0392bc..7d18570 100644 --- a/technic/items.lua +++ b/technic/items.lua @@ -66,29 +66,12 @@ minetest.register_craftitem( "technic:diamond_drill_head", { minetest.register_craft({ output = 'technic:diamond_drill_head', recipe = { - {'technic:stainless_steel_ingot', 'technic:diamond', 'technic:stainless_steel_ingot'}, - {'technic:diamond', '', 'technic:diamond'}, - {'technic:stainless_steel_ingot', 'technic:diamond', 'technic:stainless_steel_ingot'}, + {'technic:stainless_steel_ingot', 'default:diamond', 'technic:stainless_steel_ingot'}, + {'default:diamond', '', 'default:diamond'}, + {'technic:stainless_steel_ingot', 'default:diamond', 'technic:stainless_steel_ingot'}, } }) -minetest.register_craft({ - output = 'technic:diamond_block', - recipe = { - {'technic:diamond', 'technic:diamond', 'technic:diamond'}, - {'technic:diamond', 'technic:diamond', 'technic:diamond'}, - {'technic:diamond', 'technic:diamond', 'technic:diamond'}, - } -}) - -minetest.register_node( "technic:diamond_block", { - description = "Diamond Block", - tiles = { "technic_diamond_block.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - minetest.register_craft({ output = 'technic:green_energy_crystal', recipe = { @@ -111,7 +94,7 @@ minetest.register_craft({ output = 'technic:red_energy_crystal', recipe = { {'moreores:gold_ingot', 'technic:battery', 'dye:red'}, - {'technic:battery', 'technic:diamond_block', 'technic:battery'}, + {'technic:battery', 'default:diamondblock', 'technic:battery'}, {'dye:red', 'technic:battery', 'moreores:gold_ingot'}, } }) diff --git a/technic/mining_laser_mk1.lua b/technic/mining_laser_mk1.lua index a00af81..5bafb6c 100644 --- a/technic/mining_laser_mk1.lua +++ b/technic/mining_laser_mk1.lua @@ -75,7 +75,7 @@ minetest.register_tool("technic:laser_mk1", { minetest.register_craft({ output = 'technic:laser_mk1', recipe = { - {'technic:diamond', 'default:steel_ingot', 'technic:battery'}, + {'default:diamond', 'default:steel_ingot', 'technic:battery'}, {'', 'default:steel_ingot', 'technic:battery'}, {'', '', 'moreores:copper_ingot'}, } diff --git a/technic/music_player.lua b/technic/music_player.lua index ecb1e09..81b9a65 100644 --- a/technic/music_player.lua +++ b/technic/music_player.lua @@ -3,7 +3,7 @@ minetest.register_craft({ output = 'technic:music_player', recipe = { {'default:wood', 'default:wood', 'default:wood'}, - {'technic:diamond', 'technic:diamond', 'technic:diamond'}, + {'default:diamond', 'default:diamond', 'default:diamond'}, {'default:stone', 'moreores:copper_ingot', 'default:stone'}, } }) diff --git a/technic/textures/technic_brass_dust.png b/technic/textures/technic_brass_dust.png deleted file mode 100644 index 63d9ba4e62d42fa458e7bc4a0006c72dcb813858..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 464 zcmV;>0WbcEP)WFU8GbZ8()Nlj2>E@cM*00A^fL_t(I%dOKpP6AOB z#_|6h9)rAsjGEAD5<*gOcN#AjUkzWP~O=j5r%|D24e=(NK>s}D1djX?#>9NdUf0Y0000YB%k~10WC%}JriF*c7?kgZ;o@X7F_Nb6Mw<&;$U=yu3jG diff --git a/technic/textures/technic_chromium_ingot.png b/technic/textures/technic_chromium_ingot.png deleted file mode 100644 index 91d5b20e0268ad4a9f0e34832b5ff9aa9492a870..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!3HF+tk*dLq}Y|gW!U_%O?XxI14-? ziy0XBfUe5)PAOCOv z_fJpjbBcOeOp=7dg~Zd3WHadX-rz}6bXR6(Wu%oBKj{rPL{*K3jd@Wj{GA2v9cF~ll67Cia&_5bbj fbAQ`2ed1)uwzg4{+VNyR&?yX_u6{1-oD!M<9}iL# diff --git a/technic/textures/technic_chromium_lump.png b/technic/textures/technic_chromium_lump.png deleted file mode 100644 index 1588f92822de49e54c0af890405caff065794763..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPahd8UEc2QkTG*BqX)5S5w;&gI?1S>PYM4{)Ns;{r? zdvw**j(KchJRxmXrf+WAJqKb6Mw<&;$U? CYeee+ diff --git a/technic/textures/technic_concrete_block.png b/technic/textures/technic_concrete_block.png deleted file mode 100644 index cd94594c4d12f04959c21ae1dccb4189aebc87ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 500 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 N002ovPDHLkV1lH-nW_K) diff --git a/technic/textures/technic_mineral_diamond.png b/technic/textures/technic_mineral_diamond.png deleted file mode 100644 index 2d9150569a7378f0a2a6eaa4c6edba06cb3f809c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 904 zcmV;319$w1P)mwMya!zf*=;FwZa5p7hdRv zj;Tdq$SwrkmEeUSI1$m=fn`H9f}IE*t=)%CY1XW1(j{p=+MMJh%lUgzS7oy2=H-2P zpZDQ;Uh&%DH%VSeax+@nG&1=-maqskHREuDQ7My27f^lL)}C^H;T(H*JwU3EA*gB` z-_X(*?q^bK&wlc8`a=QDUdQoy9+XL+=jba5SM;}o*ud{^r&gCtjSNdi zBtrD{Hw3`+v7@pci@}2rF)=eE7Uq9Nj7_}2$>>v3n&y_T=Aj{;|L`MG%4I0zHvlM< zbEqyCnx@gNYAmI%Vk#aKLpB)s>ZG_qo<4R|mQJ50@mCy|b93xzad#NK5*{uKcvmgONM~(>bpc9{VR6TI--u4P53f%p9PR>l z3#~00>C_Uc+Roi~_T$q$nAI9yR}V^8cpKK*8rIqxKRz=m0S3Q6BdRt#TA&?KuQM6G zO-AP~h)OjNKqi}KYX6Yj`{n0COuqXzcB{dK)g;veQx%b|e9pmFd35J6B18wY>Ju75G(6}zi-hwzaGW@T| zp;tv)PcO=!iwPFvm$`5E0E2_~Gdnj=HoL;TyZ2DcU85mw_%w~xT$+OmbE0M#)XOIJ efCq1L3x5ONc0c{pc!*p80000(nzie&(yn#RbxZ_DZpIjBC)5j9h+m9>%pxM* zxKd|vGQm5=3ojIeg7Zc%R&Y+KZ0L~UhTZ0>+eq53`C6Lgq;1aWNtW~XVjBFy=k9%Z zA0B?sD_);CPI@uTKh@f&Kn-e*JLTHd%k19y7+Ir0MAhg! z+9v_NotzaOF9@fJUvA9PPy*q~6-HhT$K{}fv;BiwfXE-~tAlB^) z5A7IcCA9*;53>srU@S2rA|aKE-bK;4!_c+?6kpKCnz=@LxkRU~v$?TBC={kzlbm_- zpmfLMj3p2NbK}Qk^5ZykzA0Habw z^?K1Xjj*b*l)H_s_)$z*XDl%y{xr{xACvjTb1dIV;q}~K`!WNxavp%lAM>Te^AaFBIVr?bPak5ie~`+iMX%n)tFN8K)?vFED+(di2k2&%+lUEp(Q z-J+4pE}^Pn9(-VspytQktP=3{;OdHPqZXUR7>YCV#rN{3Zx-a%NEd#!6|F5yz%7`H zZI#xhLOx%juv#K@E6qncACdD{E+eMiK0%XHXWg_&rBWQ+e}L~Uoaf6Y4mD6V4!_($ z3ZDLuk(sjsppK2QRxaberCKQsV_YqaStd>f|_bu_O z0@Zs!*+9II7$du0TKdy-YF z{GZ0prq47&#uBz@@99O1j*gN{-C)nIVfOBQluJL)lUz*l@UGpIi+89?7eP%UU(BKF mF{-9Xtzy&UYhp`FnBM`(4?l3EYBj|G00001BCpEP)Yn#+0o+M39a!!`~y%-Hnn7_OC z<$d3W=Y>bSG5Hqrv-A9y;0lerY0?&L!ri@e`M|2z$mdF^0j)EqT)BLabx)3wE#--+ z8e0y&DgjQOm=qo_h_;)nH)e4A{g_sTQDY^k>%U_RBJ-hJ-`?skhMt4=zd=K1l>{B-Ut(Ori+R>lVPj-_8`vn-tYQ~6U(_sCWjCc6BDG; zH+XvOdNyo$h6|TwNX@2LvvwWj;$O6+i-4xFSj=G<2^`C!S+jBb-1PNE_y>;{HadMa Rlk@-p002ovPDHLkV1l46q=Nte diff --git a/technic/textures/technic_obsidian.png b/technic/textures/technic_obsidian.png deleted file mode 100644 index 5feb65c38bce9cf2b78d69b48fb387e52da79bf8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 616 zcmV-u0+;=XP)tO%@03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00GQNL_t(I%Z1X*RvJMR zM&VtjF5NUJjRr#o8RY#RE6Xf3f+!6%bvqeIvND1?^BVm7GZV8?ZyKzz^x=Uazwsq} zXUH2~<1YXVhWqf1nd^Ctk4)?hyR<=!#kJDmrNtS?E^WvfS;t>kV*zMnf*8RXN72l} zuK@6&VH2Nl0M=NB{7$7%wE%{qnN~WIo|sBc(nu$B0B+nJ+w@EymPn8Zhq9wmFz3(A z`2d1UP%3l3q>+xPy(Md8=6b3Y!G%bt(0000Yxd6vpvqW;(V! zHlBE76_4%6vWk@uMF^=CQD6~~(wCIBVnrAI6#Y)D*?=IBAZV3BP$N-^f=DeaH79fJVR;&F0z&i;*aLn9VYo7qPm?X*2^SldE%9mwXzH$Ws09Kae z6W{kY27^JT*=$~9jBRnw|8WHXfH#!VeE{F|dcD((vE@9^Zy95lD*%i!hm_JH48tp7 z7!IYBb4scE#u)7c003I+UkM?dG)+I5o0~gF2pJ0@ezDfN0RYfa%EyF|m1?zmCW@j} zA;g{#;?NZU0Jsoh*IN5ktJO;D_4=yTdXsZLb_D={w?c^hN~QAka5(HWo6WPF^IMcs z?g{{F?V(cY58wB%j7FmcDP^@NiU(3k>jVG*Qp(>r=eg&3pS4=8^IGc{lgVV?8DNHZ z#yJmawc6!0P1k}TxH}$?-#7yRFr4$JTI)0Ic6%jBl0~icoh-|kD*ymU#@Id2^A?tt zmabZBPZL768Dr8F0M=Tel-ki+U+(w&Unr&Ol+uSn2<-#_078f&%d)*72(AtWgLNT< z&hz|dt+jOmm>uO`Qp$ryqw#IG+g(#iy`D~|&y6u|006)k`&|ezO_F4z-|v4K1i_1= zqoV_7001C_JmZ|JG)+H`<9NL+%bhIC{&WTaUED!e*T)Zb~K$%Z%QeR6Ts{y6s7c0 rQ4}r4*x!`Whf+$7caVqo{ilBc1GJl=xluv200000NkvXXu0mjfdTMa{ diff --git a/technic/textures/technic_uranium.png b/technic/textures/technic_uranium.png deleted file mode 100644 index 54225f8c75e51661866315d6152c05ef85cd7984..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPahXkLcjLf@zyMRJTo-U3d7N?UFBv_gGB?>*~)YZSS z@5$B5IO?&5@r2YxMziLK0?mJao(l)YB`CRm-gn*l-(%B+`>$pHcW#wj&waw|fajHF z!TFD-+s`)^knPxEA~2P2n*GdvQ!V9GA<32Vgcx5PR9tzf_+B8;HU>{uKbLh*2~7ay C0Y)kS diff --git a/technic/textures/technic_zinc_ingot.png b/technic/textures/technic_zinc_ingot.png deleted file mode 100644 index 096ff9c7e31b59e2f9d6dab0c854e7c390adecb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!3HF+tk*dLq}Y|gW!U_%O?XxI14-? ziy0XBfUMvvDg%*_O-!3e|hMIEGl9PEL?ub!n6hfB*M> z;n#chIYm7!CP~8IFN7r>$!5^&y}^^D=&sDn%zXH)c)p|r5JY%f<+;qkT);f9{>PaE zK%k&`z(#%oBKjeR(YI*K3iS`0rx(hYb#946(|N2LE3i{V)7| f-amV$Pn-;YCtEwk%1qr4bP9u~tDnm{r-UW|bFoqv diff --git a/technic/textures/technic_zinc_lump.png b/technic/textures/technic_zinc_lump.png deleted file mode 100644 index d28a6dcd8d146325f13252315478adbaa393d02c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPa7c(0#g9G1T7obqGr;B5V#p&b(307u)i9*jg_5a@6 z_vC7vJmRs1@r2YxMziLK0?oSbb0=!(8%$hO`F`*J{~vcHfT;Vm>be3mHF{Y^nCDED z_*nJlpu3NuSdgi}RK92P{`Z?|P3D!9TscpOk$0yoQ)$eHk3j1fJYD@<);T3K0RY+| BMZ5q2 diff --git a/technic/textures/technicx32/technic_brass_ingot.png b/technic/textures/technicx32/technic_brass_ingot.png deleted file mode 100644 index 2d8b1535f33e8a853930780775839a93c01264c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 456 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sChgD_*?nYB%k~10WC%}JriF*c7?kgZ;o@X7F_Nb6Mw<&;$U=yu3jG diff --git a/technic/textures/technicx32/technic_chromium_ingot.png b/technic/textures/technicx32/technic_chromium_ingot.png deleted file mode 100644 index 91d5b20e0268ad4a9f0e34832b5ff9aa9492a870..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!3HF+tk*dLq}Y|gW!U_%O?XxI14-? ziy0XBfUe5)PAOCOv z_fJpjbBcOeOp=7dg~Zd3WHadX-rz}6bXR6(Wu%oBKj{rPL{*K3jd@Wj{GA2v9cF~ll67Cia&_5bbj fbAQ`2ed1)uwzg4{+VNyR&?yX_u6{1-oD!M<9}iL# diff --git a/technic/textures/technicx32/technic_chromium_lump.png b/technic/textures/technicx32/technic_chromium_lump.png deleted file mode 100644 index 1588f92822de49e54c0af890405caff065794763..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPahd8UEc2QkTG*BqX)5S5w;&gI?1S>PYM4{)Ns;{r? zdvw**j(KchJRxmXrf+WAJqKb6Mw<&;$U? CYeee+ diff --git a/technic/textures/technicx32/technic_concrete_block.png b/technic/textures/technicx32/technic_concrete_block.png deleted file mode 100644 index 91364f33f5d51e6b83765b15bb57ac1fab0698a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2319 zcmV+q3GnubP)#R7{j`*<9PuCBMxgFDP1`4F-AC!lQBBC+eXO+?>){ttOy?;cb3KDose=z z6`U3N7`U7ZKYo1Y^YcNi6=Pso7J_%Q-m%u=oW(lJ+qWC7K`9w)1q?i&2O@$hc;~2f z5JF&CB04&$6s)tT8fsHi2daV*A$pILS{S_%mw*+65n+h|?>z=kRj%ve{nsbP7-~th zT4}8z#>`?wFh)49%yAq5JRVQ1b2uvuRmK?f-Z`&KZH<&OtyN^(Hs0?~z_4u_PQZId z${FVzITvahhzR%llhy}{;pfl)!5HD&+Z!SVYvwn`!2A0L&*R|Z{R3lQ4URDsV}xZ{ zsHL#23){9L+ACtfTA|i5k4`&c3|Gn+W9WU5OXE0Z_acVZw>MgEwANAWC?KMM!H0lz z4kMQ9O57h$6iB&XP(rYX70&a*ZTk%nLhyhmM$c#+=PJ%;PyqcZq|=7w^VcWezr9jg z=XTp^CDU4`sG-z?>job@IcItwgy7N9F#xJK=XiYH+4dcGo)@hT`jr@CP>N%X9vB4g z`Mf`9trKHpT~}&rh_wt=taUsePY}x(1MeN)J5-ezJjZdeZX2~0dLKAvDYX%TL#*JP z;0$2IphFp|)Y>@D3ss0qM8vZ15gmi;Itd~2eHLfdh90_;j!Wun~>tcy3y$@8O56Gn=)_^MBIlTAuUeP|d-yeur zj_cxiCJgYmzy1b544zVi);lRB)WE*27_mGacXSM*cU&pqoCw>tq8O|dK0co~XE9>% z&SEV%=jeUVTF3i9ADw^w`|qS&X{}JJqQK*EV2qNTCj>uP(gv!XkIy@;502wxTNluQ zSV7ixVObVpjHD~E#E7avbzrT*I}h4Oh@GhP&LiS5 zhB-tbV1U*d06*StSZjH?ZFo2NURwhUxpYK?HF|>gIA_t(sb#XnIfq#1Ij%G@TPsF{ z$K#k&o-(CYu9Q%PQVJ<0wryn$#W~?P6V3_F3EQ?1y`}d)uS;g3$CYMbwQ)QTu9OJD zkJ}-wO`$b$dB7jtCcGk+`2^eZQ=2}z5w9~A<)ObiouHEyb=It!&!qd4n+_n80#1{ zbAKLKnR9TS7cVb6A0Ky0tvG90*M&X?0IhYbb&N4^t#^8^EYY)XD~BY`D^E(hg1-p>xb^V4!hxUR%d&{4VV8{T_rZ9E=d zYTtK6rW;}mtn17h>k?p0FYMcjdpu9pH4>aHR7x#T^DC=eB7VN%WWs6!j43OImStsK*BMks z=e!a+qXnQ}AhHY{3{|f474LhB7HGnD!mS^Jojvlh(2S)uhYT@VA;dC^D5 z7;vq1_HDx$_;%ZPKA$t58N<45I5E`LIG!iVy0EM(I+Rip+ZMl+?dIKH378%!Ib)2{ zo$zwo0j0HxdLx1}LMatztwnWUjN$YCVDvHD(;2tCcPwjUS>r@=aG+6mC{Yj}6D>L{GZS>aIww=)jPQobIi;m@D%h{()=DAGFK2}_KWoVmT+V03!#_^@E@ z%nrr~?;oGIF&d9&ruT+5hM~%DKfZIN3&R|s<4oN4jeXy#wbJ_x9k-Vot#wB4^j1-n z(L1NkqrXzYmdX+X06Ax_bRotPLcmT=SaL3e5LwsA@jN-Nix?cvI=T*Gh+L`A+QHCi zyluN-bnyFcZ+v_{$)#fLG-S$!S{uE0#5k@i5tlgsi)CHnTzMF z&Y9ylamSg!7;gK pLtt4vs){OL46SuST)w)8{{?77tH*U*h@Aic002ovPDHLkV1g4LUh)6{ diff --git a/technic/textures/technicx32/technic_diamond.png b/technic/textures/technicx32/technic_diamond.png deleted file mode 100644 index 23e6126b15305b5c9bb26720f309724f53cbc497..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 693 zcmV;m0!safP)^g%F{hwC^)U{sR>yU)5$>9Ok zR$2;Cwqo+*G;;YooK7c<3ah=2FE9wueI#&000&Mih?zF!W%an8-EukoNOn0 zo`=^e!(Qe@io2TJH^37Mk^1 z^v1`K$uDDab`Dmv1WG9cx(KT*qeL)aX_>;PVW?m-lFRLF2Y;5h<5c_8?X}h6S3|?F zn?)=v6Sy5E5IH?&W@nK~r2w4)f`-uUp6B^UBvR873BUer#$1j|#YHjQI bx6kw)?!dxZ$$ZS|00000NkvXXu0mjf2W&f& diff --git a/technic/textures/technicx32/technic_diamond_block.png b/technic/textures/technicx32/technic_diamond_block.png deleted file mode 100644 index 347ed78351ea069508b94254893df237fb31c819..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2865 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 P00000NkvXXu0mjfc+PiO diff --git a/technic/textures/technicx32/technic_granite.png b/technic/textures/technicx32/technic_granite.png deleted file mode 100644 index abb1385018cf7f1acdeac44bc9a87f04e8dbbce5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 947 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 N002ovPDHLkV1lH-nW_K) diff --git a/technic/textures/technicx32/technic_mineral_diamond.png b/technic/textures/technicx32/technic_mineral_diamond.png deleted file mode 100644 index 2d9150569a7378f0a2a6eaa4c6edba06cb3f809c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 904 zcmV;319$w1P)mwMya!zf*=;FwZa5p7hdRv zj;Tdq$SwrkmEeUSI1$m=fn`H9f}IE*t=)%CY1XW1(j{p=+MMJh%lUgzS7oy2=H-2P zpZDQ;Uh&%DH%VSeax+@nG&1=-maqskHREuDQ7My27f^lL)}C^H;T(H*JwU3EA*gB` z-_X(*?q^bK&wlc8`a=QDUdQoy9+XL+=jba5SM;}o*ud{^r&gCtjSNdi zBtrD{Hw3`+v7@pci@}2rF)=eE7Uq9Nj7_}2$>>v3n&y_T=Aj{;|L`MG%4I0zHvlM< zbEqyCnx@gNYAmI%Vk#aKLpB)s>ZG_qo<4R|mQJ50@mCy|b93xzad#NK5*{uKcvmgONM~(>bpc9{VR6TI--u4P53f%p9PR>l z3#~00>C_Uc+Roi~_T$q$nAI9yR}V^8cpKK*8rIqxKRz=m0S3Q6BdRt#TA&?KuQM6G zO-AP~h)OjNKqi}KYX6Yj`{n0COuqXzcB{dK)g;veQx%b|e9pmFd35J6B18wY>Ju75G(6}zi-hwzaGW@T| zp;tv)PcO=!iwPFvm$`5E0E2_~Gdnj=HoL;TyZ2DcU85mw_%w~xT$+OmbE0M#)XOIJ efCq1L3x5ONc0c{pc!*p80000(nzie&(yn#RbxZ_DZpIjBC)5j9h+m9>%pxM* zxKd|vGQm5=3ojIeg7Zc%R&Y+KZ0L~UhTZ0>+eq53`C6Lgq;1aWNtW~XVjBFy=k9%Z zA0B?sD_);CPI@uTKh@f&Kn-e*JLTHd%k19y7+Ir0MAhg! z+9v_NotzaOF9@fJUvA9PPy*q~6-HhT$K{}fv;BiwfXE-~tAlB^) z5A7IcCA9*;53>srU@S2rA|aKE-bK;4!_c+?6kpKCnz=@LxkRU~v$?TBC={kzlbm_- zpmfLMj3p2NbK}Qk^5ZykzA0Habw z^?K1Xjj*b*l)H_s_)$z*XDl%y{xr{xACvjTb1dIV;q}~K`!WNxavp%lAM>Te^AaFBIVr?bPak5ie~`+iMX%n)tFN8K)?vFED+(di2k2&%+lUEp(Q z-J+4pE}^Pn9(-VspytQktP=3{;OdHPqZXUR7>YCV#rN{3Zx-a%NEd#!6|F5yz%7`H zZI#xhLOx%juv#K@E6qncACdD{E+eMiK0%XHXWg_&rBWQ+e}L~Uoaf6Y4mD6V4!_($ z3ZDLuk(sjsppK2QRxaberCKQsV_YqaStd>f|_bu_O z0@Zs!*+9II7$du0TKdy-YF z{GZ0prq47&#uBz@@99O1j*gN{-C)nIVfOBQluJL)lUz*l@UGpIi+89?7eP%UU(BKF mF{-9Xtzy&UYhp`FnBM`(4?l3EYBj|G00001BCpEP)Yn#+0o+M39a!!`~y%-Hnn7_OC z<$d3W=Y>bSG5Hqrv-A9y;0lerY0?&L!ri@e`M|2z$mdF^0j)EqT)BLabx)3wE#--+ z8e0y&DgjQOm=qo_h_;)nH)e4A{g_sTQDY^k>%U_RBJ-hJ-`?skhMt4=zd=K1l>{B-Ut(Ori+R>lVPj-_8`vn-tYQ~6U(_sCWjCc6BDG; zH+XvOdNyo$h6|TwNX@2LvvwWj;$O6+i-4xFSj=G<2^`C!S+jBb-1PNE_y>;{HadMa Rlk@-p002ovPDHLkV1l46q=Nte diff --git a/technic/textures/technicx32/technic_rebar.png b/technic/textures/technicx32/technic_rebar.png deleted file mode 100644 index 16d1fc541cd007378cc0ced0ca55127ec9d11952..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 813 zcmV+|1JeA7P)Yxd6vpvqW;(V! zHlBE76_4%6vWk@uMF^=CQD6~~(wCIBVnrAI6#Y)D*?=IBAZV3BP$N-^f=DeaH79fJVR;&F0z&i;*aLn9VYo7qPm?X*2^SldE%9mwXzH$Ws09Kae z6W{kY27^JT*=$~9jBRnw|8WHXfH#!VeE{F|dcD((vE@9^Zy95lD*%i!hm_JH48tp7 z7!IYBb4scE#u)7c003I+UkM?dG)+I5o0~gF2pJ0@ezDfN0RYfa%EyF|m1?zmCW@j} zA;g{#;?NZU0Jsoh*IN5ktJO;D_4=yTdXsZLb_D={w?c^hN~QAka5(HWo6WPF^IMcs z?g{{F?V(cY58wB%j7FmcDP^@NiU(3k>jVG*Qp(>r=eg&3pS4=8^IGc{lgVV?8DNHZ z#yJmawc6!0P1k}TxH}$?-#7yRFr4$JTI)0Ic6%jBl0~icoh-|kD*ymU#@Id2^A?tt zmabZBPZL768Dr8F0M=Tel-ki+U+(w&Unr&Ol+uSn2<-#_078f&%d)*72(AtWgLNT< z&hz|dt+jOmm>uO`Qp$ryqw#IG+g(#iy`D~|&y6u|006)k`&|ezO_F4z-|v4K1i_1= zqoV_7001C_JmZ|JG)+H`<9NL+%bhIC{&WTaUED!e*T)Zb~K$%Z%QeR6Ts{y6s7c0 rQ4}r4*x!`Whf+$7caVqo{ilBc1GJl=xluv200000NkvXXu0mjfdTMa{ diff --git a/technic/textures/technicx32/technic_stainless_steel_ingot.png b/technic/textures/technicx32/technic_stainless_steel_ingot.png deleted file mode 100644 index 46fa2969138ec086e8a9b9bcb9a70fee7794f076..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!3HF+tk*dLq}Y|gW!U_%O?XxI14-? ziy0XBfU*~)YZSS z@5$B5IO?&5@r2YxMziLK0?mJao(l)YB`CRm-gn*l-(%B+`>$pHcW#wj&waw|fajHF z!TFD-+s`)^knPxEA~2P2n*GdvQ!V9GA<32Vgcx5PR9tzf_+B8;HU>{uKbLh*2~7ay C0Y)kS diff --git a/technic/textures/technicx32/technic_zinc_ingot.png b/technic/textures/technicx32/technic_zinc_ingot.png deleted file mode 100644 index 096ff9c7e31b59e2f9d6dab0c854e7c390adecb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!3HF+tk*dLq}Y|gW!U_%O?XxI14-? ziy0XBfUMvvDg%*_O-!3e|hMIEGl9PEL?ub!n6hfB*M> z;n#chIYm7!CP~8IFN7r>$!5^&y}^^D=&sDn%zXH)c)p|r5JY%f<+;qkT);f9{>PaE zK%k&`z(#%oBKjeR(YI*K3iS`0rx(hYb#946(|N2LE3i{V)7| f-amV$Pn-;YCtEwk%1qr4bP9u~tDnm{r-UW|bFoqv diff --git a/technic/textures/technicx32/technic_zinc_lump.png b/technic/textures/technicx32/technic_zinc_lump.png deleted file mode 100644 index d28a6dcd8d146325f13252315478adbaa393d02c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPa7c(0#g9G1T7obqGr;B5V#p&b(307u)i9*jg_5a@6 z_vC7vJmRs1@r2YxMziLK0?oSbb0=!(8%$hO`F`*J{~vcHfT;Vm>be3mHF{Y^nCDED z_*nJlpu3NuSdgi}RK92P{`Z?|P3D!9TscpOk$0yoQ)$eHk3j1fJYD@<);T3K0RY+| BMZ5q2 diff --git a/technic/textures/textures_here.txt b/technic/textures/textures_here.txt deleted file mode 100644 index 3794085..0000000 --- a/technic/textures/textures_here.txt +++ /dev/null @@ -1 +0,0 @@ -If you haven't modified the texture_path setting, you can copy textures of your texture packs into here. Folders are currently not supported. diff --git a/technic_worldgen/crafts.lua b/technic_worldgen/crafts.lua new file mode 100644 index 0000000..7647c06 --- /dev/null +++ b/technic_worldgen/crafts.lua @@ -0,0 +1,49 @@ +minetest.register_craftitem( ":technic:uranium", { + description = "Uranium", + inventory_image = "technic_uranium.png", + on_place_on_ground = minetest.craftitem_place_item, +}) + +minetest.register_craftitem( ":technic:chromium_lump", { + description = "Chromium Lump", + inventory_image = "technic_chromium_lump.png", + on_place_on_ground = minetest.craftitem_place_item, +}) + +minetest.register_craftitem( ":technic:chromium_ingot", { + description = "Chromium Ingot", + inventory_image = "technic_chromium_ingot.png", + on_place_on_ground = minetest.craftitem_place_item, +}) + +minetest.register_craft({ + type = 'cooking', + output = "technic:chromium_ingot", + recipe = "technic:chromium_lump" +}) + +minetest.register_craftitem( ":technic:zinc_lump", { + description = "Zinc Lump", + inventory_image = "technic_zinc_lump.png", +}) + +minetest.register_craftitem( ":technic:zinc_ingot", { + description = "Zinc Ingot", + inventory_image = "technic_zinc_ingot.png", +}) + +minetest.register_craftitem( ":technic:stainless_steel_ingot", { + description = "Stainless Steel Ingot", + inventory_image = "technic_stainless_steel_ingot.png", +}) + +minetest.register_craftitem( ":technic:brass_ingot", { + description = "Brass Ingot", + inventory_image = "technic_brass_ingot.png", +}) + +minetest.register_craft({ + type = 'cooking', + output = "technic:zinc_ingot", + recipe = "technic:zinc_lump" +}) diff --git a/technic_worldgen/init.lua b/technic_worldgen/init.lua new file mode 100644 index 0000000..37aa386 --- /dev/null +++ b/technic_worldgen/init.lua @@ -0,0 +1,8 @@ +-- Minetest 0.4.6 : technic_worldgen + +modpath=minetest.get_modpath("technic_worldgen") + +dofile(modpath.."/nodes.lua") +dofile(modpath.."/oregen.lua") +--dofile(modpath.."/stairslike.lua") +dofile(modpath.."/crafts.lua") diff --git a/technic_worldgen/nodes.lua b/technic_worldgen/nodes.lua new file mode 100644 index 0000000..5952d52 --- /dev/null +++ b/technic_worldgen/nodes.lua @@ -0,0 +1,58 @@ +minetest.register_node( ":technic:mineral_uranium", { + description = "Uranium Ore", + tiles = { "default_stone.png^technic_mineral_uranium.png" }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), + drop = 'craft "technic:uranium" 1', +}) + +minetest.register_node( ":technic:mineral_chromium", { + description = "Chromium Ore", + tiles = { "default_stone.png^technic_mineral_chromium.png" }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), + drop = 'craft "technic:chromium_lump" 1', +}) + +minetest.register_node( ":technic:mineral_zinc", { + description = "Zinc Ore", + tile_images = { "default_stone.png^technic_mineral_zinc.png" }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), + drop = 'craft "technic:zinc_lump" 1', +}) + +minetest.register_node( ":technic:granite", { + description = "Granite", + tiles = { "technic_granite.png" }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node( ":technic:marble", { + description = "Marble", + tiles = { "technic_marble.png" }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node( ":technic:marble_bricks", { + description = "Marble Bricks", + tiles = { "technic_marble_bricks.png" }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_craft({ + output = 'technic:marble_bricks 4', + recipe = { + {'technic:marble','technic:marble'}, + {'technic:marble','technic:marble'} + } +}) diff --git a/technic_worldgen/oregen.lua b/technic_worldgen/oregen.lua new file mode 100644 index 0000000..ad2d5d6 --- /dev/null +++ b/technic_worldgen/oregen.lua @@ -0,0 +1,66 @@ +minetest.register_ore({ + ore_type = "scatter", + ore = "technic:mineral_diamond", + wherein = "default:stone", + clust_scarcity = 11*11*11, + clust_num_ores = 4, + clust_size = 3, + height_min = -31000, + height_max = -450, +}) + +minetest.register_ore({ + ore_type = "scatter", + ore = "technic:mineral_uranium", + wherein = "default:stone", + clust_scarcity = 10*10*10, + clust_num_ores = 4, + clust_size = 3, + height_min = -300, + height_max = -80, +}) +minetest.register_ore({ + ore_type = "scatter", + ore = "technic:mineral_chromium", + wherein = "default:stone", + clust_scarcity = 10*10*10, + clust_num_ores = 2, + clust_size = 3, + height_min = -31000, + height_max = -100, +}) +minetest.register_ore({ + ore_type = "scatter", + ore = "technic:mineral_zinc", + wherein = "default:stone", + clust_scarcity = 9*9*9, + clust_num_ores = 4, + clust_size = 3, + height_min = -31000, + height_max = 2, +}) +minetest.register_ore({ + ore_type = "sheet", + ore = "technic:marble", + wherein = "default:stone", + clust_scarcity = 1, + clust_num_ores = 1, + clust_size = 3, + height_min = -150, + height_max = -50, + noise_threshhold = 0.5, + noise_params = {offset=0, scale=15, spread={x=150, y=150, z=150}, seed=23, octaves=3, persist=0.70} +}) +minetest.register_ore({ + ore_type = "sheet", + ore = "technic:granite", + wherein = "default:stone", + clust_scarcity = 1, + clust_num_ores = 1, + clust_size = 4, + height_min = -100, + height_max = -250, + noise_threshhold = 0.5, + noise_params = {offset=0, scale=15, spread={x=130, y=130, z=130}, seed=24, octaves=3, persist=0.70} +}) + diff --git a/technic/ores.lua b/technic_worldgen/stairslike.lua similarity index 54% rename from technic/ores.lua rename to technic_worldgen/stairslike.lua index cfd5d2a..038d653 100644 --- a/technic/ores.lua +++ b/technic_worldgen/stairslike.lua @@ -1,35 +1,3 @@ -minetest.register_node( "technic:marble", { - description = "Marble", - tiles = { "technic_marble.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_node( "technic:marble_bricks", { - description = "Marble Bricks", - tiles = { "technic_marble_bricks.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_craft({ - output = 'technic:marble_bricks 4', - recipe = { - {'technic:marble','technic:marble'}, - {'technic:marble','technic:marble'} - } -}) - -minetest.register_node( "technic:granite", { - description = "Granite", - tiles = { "technic_granite.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - -- cross-compatibility with default obsidian function register_technic_stairs_alias(modname, origname, newmod, newname) @@ -64,7 +32,6 @@ function register_technic_stairs_alias(modname, origname, newmod, newname) minetest.register_alias(modname .. ":micro_" .. origname .. "_top", newmod..":micro_" .. newname .. "_top") end - minetest.register_alias("technic:obsidian", "default:obsidian") minetest.register_alias("moreblocks:obsidian", "default:obsidian") @@ -154,161 +121,3 @@ register_stair_slab_panel_micro(":stairsplus", "obsidian", "technic:obsidian", "Obsidian Microblock", "obsidian") end - -minetest.register_node( "technic:mineral_diamond", { - description = "Diamond Ore", - tiles = { "default_stone.png^technic_mineral_diamond.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - drop = 'craft "technic:diamond" 1', -}) - -minetest.register_craftitem( "technic:diamond", { - description = "Diamond", - inventory_image = "technic_diamond.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_node( "technic:mineral_uranium", { - description = "Uranium Ore", - tiles = { "default_stone.png^technic_mineral_uranium.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - drop = 'craft "technic:uranium" 1', -}) - -minetest.register_craftitem( "technic:uranium", { - description = "Uranium", - inventory_image = "technic_uranium.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_node( "technic:mineral_chromium", { - description = "Chromium Ore", - tiles = { "default_stone.png^technic_mineral_chromium.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - drop = 'craft "technic:chromium_lump" 1', -}) - -minetest.register_craftitem( "technic:chromium_lump", { - description = "Chromium Lump", - inventory_image = "technic_chromium_lump.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_craftitem( "technic:chromium_ingot", { - description = "Chromium Ingot", - inventory_image = "technic_chromium_ingot.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_craft({ - type = 'cooking', - output = "technic:chromium_ingot", - recipe = "technic:chromium_lump" - }) - - -minetest.register_node( "technic:mineral_zinc", { - description = "Zinc Ore", - tile_images = { "default_stone.png^technic_mineral_zinc.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - drop = 'craft "technic:zinc_lump" 1', -}) - -minetest.register_craftitem( "technic:zinc_lump", { - description = "Zinc Lump", - inventory_image = "technic_zinc_lump.png", -}) - -minetest.register_craftitem( "technic:zinc_ingot", { - description = "Zinc Ingot", - inventory_image = "technic_zinc_ingot.png", -}) - -minetest.register_craftitem( "technic:stainless_steel_ingot", { - description = "Stainless Steel Ingot", - inventory_image = "technic_stainless_steel_ingot.png", -}) - -minetest.register_craftitem( "technic:brass_ingot", { - description = "Brass Ingot", - inventory_image = "technic_brass_ingot.png", -}) - -minetest.register_craft({ - type = 'cooking', - output = "technic:zinc_ingot", - recipe = "technic:zinc_lump" - }) - -minetest.register_ore({ - ore_type = "scatter", - ore = "technic:mineral_diamond", - wherein = "default:stone", - clust_scarcity = 11*11*11, - clust_num_ores = 4, - clust_size = 3, - height_min = -31000, - height_max = -450, -}) -minetest.register_ore({ - ore_type = "scatter", - ore = "technic:mineral_uranium", - wherein = "default:stone", - clust_scarcity = 10*10*10, - clust_num_ores = 4, - clust_size = 3, - height_min = -300, - height_max = -80, -}) -minetest.register_ore({ - ore_type = "scatter", - ore = "technic:mineral_chromium", - wherein = "default:stone", - clust_scarcity = 10*10*10, - clust_num_ores = 2, - clust_size = 3, - height_min = -31000, - height_max = -100, -}) -minetest.register_ore({ - ore_type = "scatter", - ore = "technic:mineral_zinc", - wherein = "default:stone", - clust_scarcity = 9*9*9, - clust_num_ores = 4, - clust_size = 3, - height_min = -31000, - height_max = 2, -}) -minetest.register_ore({ - ore_type = "sheet", - ore = "technic:marble", - wherein = "default:stone", - clust_scarcity = 1, - clust_num_ores = 1, - clust_size = 3, - height_min = -150, - height_max = -50, - noise_threshhold = 0.5, - noise_params = {offset=0, scale=15, spread={x=150, y=150, z=150}, seed=23, octaves=3, persist=0.70} -}) -minetest.register_ore({ - ore_type = "sheet", - ore = "technic:granite", - wherein = "default:stone", - clust_scarcity = 1, - clust_num_ores = 1, - clust_size = 4, - height_min = -100, - height_max = -250, - noise_threshhold = 0.5, - noise_params = {offset=0, scale=15, spread={x=130, y=130, z=130}, seed=24, octaves=3, persist=0.70} -}) diff --git a/unified_inventory/depends.txt b/unified_inventory/depends.txt index 4be0815..8b79558 100644 --- a/unified_inventory/depends.txt +++ b/unified_inventory/depends.txt @@ -1 +1,2 @@ aaa_recipeshook +creative diff --git a/unified_inventory/init.lua b/unified_inventory/init.lua index 80855b3..cc170a0 100644 --- a/unified_inventory/init.lua +++ b/unified_inventory/init.lua @@ -1,4 +1,11 @@ --- load api -dofile(minetest.get_modpath("unified_inventory").."/api.lua") +-- Unified Inventory mod 0.4.6 +-- disable default creative inventory +if creative_inventory then + creative_inventory.set_creative_formspec = function(player, start_i, pagenum) + return + end +end + +dofile(minetest.get_modpath("unified_inventory").."/api.lua") dofile(minetest.get_modpath("unified_inventory").."/bags.lua")