Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
7,913 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

7913 Commits (44c524f7bc9230f9254c266afebde84701905d8f)

Author SHA1 Message Date
cora 44c524f7bc Merge pull request 'Cooking potatoes with smokers' (#2319) from mrminer/MineClone2-potato-patch:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2319
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-06-15 03:04:46 +00:00
mrminer 110b293297 Update 'mods/ITEMS/mcl_farming/potatoes.lua' 2022-06-15 01:30:55 +00:00
cora d78ba13dea Merge pull request 'mcl_spyglass by NO11' (#2309) from mcl_spyglass into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2309
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-06-14 19:49:22 +00:00
cora 27a84799e4 remove superfluous dependencies 2022-06-13 12:32:48 +02:00
cora bd6d777f05 remove check for mcl_copper, fix recipe 2022-06-13 12:29:47 +02:00
cora 7dd6d5f886 spaces -> tabs 2022-06-13 12:29:47 +02:00
PrairieAstronomer e58387d123 Removed screenshots and Liscense 2022-06-13 12:29:47 +02:00
NO11 c4aa634a40 mcl_spyglass by NO11 2022-06-13 12:29:17 +02:00
cora 38a99d99ed Merge pull request 'Add Smooth Basalt node, Fix several hardness and blast_resistance values' (#2300) from smooth_basalt into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2300
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-06-13 00:51:47 +00:00
cora 9cea10a706 fix more blast resistance and hardness values 2022-06-13 02:48:00 +02:00
cora 2074fec7a1 Fix hardness and b.resistance of blackstone nodes 2022-06-13 02:48:00 +02:00
cora 4e1b6074c7 Add Smooth Basalt node 2022-06-13 02:48:00 +02:00
cora 8aaa7f9400 Merge pull request 'Fix Global var warnings' (#2305) from fix_global_var_warnings into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2305
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-06-13 00:46:49 +00:00
cora a43627e268 Fix 2 wrong variable uses that made warnings 2022-06-12 01:35:27 +00:00
cora 00e94c81c4 Merge pull request 'New Advancements' (#2303) from PrairieAstronomer/MineClone2:PrairieWind_advancements into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2303
 2022-06-12 01:30:57 +00:00
PrairieAstronomer 87a45ad78e Minor Format Detail in Country Lode Advancement 2022-06-11 19:14:28 -06:00
PrairieAstronomer bbd86045e5 Country Lode, Take Me Home Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer eb72bb81da Fishy Business Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer b544fb819d What A Deal! Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer 17e2f05971 Sweet Dreams Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer 2a62936fe7 Postmortal Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer 91f8f44e17 The End? Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer 1a5195b5e6 Isn't It Iron Pick Advancement 2022-06-11 15:35:48 -06:00
epCode fab6cf8152 Merge pull request 'Raytraced_arrows_fix' (#2297) from Raytraced_arrows_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2297
 2022-06-11 02:42:45 +00:00
epCode ef92475d35 Merge pull request 'master' (#2296) from master into Raytraced_arrows_fix 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2296
 2022-06-11 02:42:04 +00:00
epCode 6bc5e76b8f fix tipped arrows and rocket 2022-06-10 19:40:12 -07:00
cora e4f514bb10 Merge pull request 'Change arrow hit detection for accruate shooting' (#2289) from Raytraced_arrows into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2289
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-06-11 02:29:26 +00:00
epCode 6a74adc261 Merge pull request 'master' (#2290) from master into Raytraced_arrows 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2290
 2022-06-09 16:18:56 +00:00
cora ad55ba435a Merge pull request 'Add sus stews via subtree' (#2288) from sus_stew into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2288
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-06-08 20:19:45 +00:00
cora d1149ee49a Add 'mods/ITEMS/mcl_sus_stew/' from commit '6048efbc988390321952e9ba1da4f6342df59cbf' 
git-subtree-dir: mods/ITEMS/mcl_sus_stew
git-subtree-mainline: 8d9131eda3
git-subtree-split: 6048efbc98
 2022-06-08 05:16:58 +02:00
cora 8d9131eda3 Merge pull request 'Knockback fixes:' (#2283) from knockback_fixes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2283
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-06-08 01:08:21 +00:00
chmodsayshello 6048efbc98 Merge pull request 'Use item meta to store effect information' (#1) from cora/mcl_sus_stew:master into master 
Reviewed-on: https://git.minetest.land/chmodsayshello/mcl_sus_stew/pulls/1
 2022-06-07 18:46:14 +00:00
epCode 0aaede2f50 Merge pull request 'master' (#2285) from master into Raytraced_arrows 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2285
 2022-06-07 18:41:22 +00:00
MysticTempest 45ec876167 Knockback fixes: 
This PR enables knockback for snowballs, and eggs.
And disables knockback for the following mobs: Shulkers, Iron Golems,
and Ender Dragons.
 2022-06-07 02:55:19 -05:00
epCode 6c804f44d5 add a small bit of doc 2022-06-06 18:43:50 -07:00
cora 61ddec5a85 Merge pull request 'Fix a couple of warnings (game.conf, shipwreck get_mapgen_params)' (#2277) from fix_warnings into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2277
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-06-07 01:19:10 +00:00
cora 5c057f24fb get_mapgen_params -> get_mapgen_setting 2022-06-07 03:17:32 +02:00
cora 0fd25d15fa name -> title in game.conf 2022-06-07 03:17:32 +02:00
epCode ca5db36ccd Merge pull request 'Make loaded Crossbow (Corssbow) not show up in creative inventory' (#2281) from epcode-patch-1 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2281
 2022-06-07 00:59:19 +00:00
epCode d738229298 Make loaded Crossbow (Corssbow) not show up in creative inventory 2022-06-07 00:58:37 +00:00
epCode 78940e109c fix critical hit displaying in the wrong place 2022-06-06 14:38:18 -07:00
epCode fdb7d5bfad fixed Badly calculated arrow direction 2022-06-06 14:32:07 -07:00
epCode f2c2f4106b fix arrows not disapearing after mob hit, and self damaging 2022-06-06 13:55:28 -07:00
epCode e1feec9a30 Add Raytracing arrows 2022-06-06 13:42:24 -07:00
epCode 5c561b951c Merge pull request 'villager_anims_and_sounds' (#2279) from villager_anims_and_sounds into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2279
 2022-06-06 19:09:59 +00:00
epCode ad486a56fd Add more Villager sounds 2022-06-06 12:09:14 -07:00
epCode 42c764e149 Make Villager nod/head shake 2022-06-06 11:12:57 -07:00
cora 6c89c8f675 Merge pull request 'shipwrecks' (#2270) from shipwrecks into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2270
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-06-05 23:12:47 +00:00
cora 4bff9710a0 Make structblock non walk- and pointable 2022-06-06 01:08:55 +02:00
cora d4e4bc8708 add rarer beached shipwreck 2022-06-05 13:10:36 +02:00