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

8386 Commits (20b229a9b9a5daf6e12ce441d83a409a2d82dc55)

Author SHA1 Message Date
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
cora b7419dc207 randomly enchant treasure 2022-06-05 13:10:36 +02:00
cora 4af1094eed Add shipwrecks 
schematics by chmodsayshello
 2022-06-05 13:10:36 +02:00
cora dd9a93ca19 Merge pull request 'Fix crash on rapidly fired rocket-arrows' (#2273) from fix_rocket_crash into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2273
 2022-06-05 10:48:08 +00:00
cora ef093d0c00 Be more careful with possibly expired objects 2022-06-04 20:26:00 +02:00
cora 6f3c013d41 random effect on sstew with no meta 2022-06-04 02:44:39 +02:00
cora 3cd87dfe38 use itemmeta instead of separate itemstrings 2022-06-04 02:25:14 +02:00
cora f1778d839d Merge pull request 'Make items flowing in water use acceleration for movement.' (#2271) from item_movement_fix_part2 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2271
 2022-06-03 21:29:07 +00:00
MysticTempest b4c5805afe Make items flowing in water use acceleration for movement. 2022-06-03 05:46:27 -05:00
cora 62d7b8cc77 move depends.txt to mod.conf 2022-06-03 12:43:25 +02:00
cora b650cd8a97 Merge pull request 'Item movement fixes:' (#2269) from item_movement_fixes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2269
 2022-06-02 09:49:31 +00:00
MysticTempest 5dde594c19 Item movement fixes: 
This PR fixes items at flowing_water edges not falling down holes.
As well as fixing items not sliding on slippery nodes like ice.

And, allows for movement starting at the source block of a
flowing water node. While ensuring regular water_source blocks
do not bug out.
 2022-06-02 09:44:04 +00:00
cora 44e4e53cf2 Merge pull request 'Make breaking boats by hand easier.' (#2268) from boat_breaking_by_hand_fixes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2268
 2022-06-02 09:43:16 +00:00
MysticTempest 983b8f0934 Make breaking boats by hand easier. 2022-06-02 00:20:44 -05:00
cora b27634fcb2 Merge pull request 'Fix crash when unknown item in offhand slot' (#2265) from fix-unknown-offhand into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2265
Reviewed-by: NO11 <no11@noreply.git.minetest.land>
 2022-05-31 21:40:00 +00:00
NO11 25d847f49f Fix crash when unknown item in offhand slot 2022-05-31 22:43:30 +02:00
cora 5778c2d27a Merge pull request 'Fix items obtained from villager trades:' (#2264) from Fix_items_obtained_from_villagers into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2264
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-30 21:21:54 +00:00
MysticTempest 31106a2031 Fix items obtained from villager trades: 
This PR stops the load_enchantments function from being
called for all items in the villager trades.
Fixing non-enchanted items from villagers being unable to stack
with their regular counterparts.

As they now, no longer have any description metadata.
While also ensuring that enchanted items still have their
tooltips, and work.
 2022-05-30 15:11:22 -05:00
cora ad1b7510aa Merge pull request 'Update old mobs_mc_ horse armor textures' (#2262) from legacy_horse_armor_texture into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2262
 2022-05-30 10:54:12 +00:00
cora dc21b02d04 update old mobs_mc_ horse armor textures 2022-05-30 10:49:38 +00:00
Elias Fleckenstein a86fc935aa mcl_maps: add callback to load_map function (#2261) 
Fixes maps in itemframes not loading after restart (#2255)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2261
Co-authored-by: Elias Fleckenstein <eliasfleckenstein@web.de>
Co-committed-by: Elias Fleckenstein <eliasfleckenstein@web.de>
 2022-05-30 01:32:20 +00:00
cora 50c802df98 Merge pull request 'Make new jobsite tables diggable.' (#2260) from fix_undiggable_jobsites into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2260
Reviewed-by: Elias Fleckenstein <eliasfleckenstein@web.de>
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-05-29 20:12:57 +00:00
cora a44347f641 make cart.table, fletch.table and loom diggable 2022-05-29 22:07:47 +02:00
cora a85bf22695 Merge pull request 'Spawn witch and black cat on witchhut generation' (#2246) from spawn_witches into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2246
 2022-05-29 00:35:37 +00:00
cora e4a4648b25 fix size of black cat texture 2022-05-29 02:34:02 +02:00
cora 6b9cb0062d save home coords in cat entity as well 2022-05-29 02:34:02 +02:00
cora 2337e72a23 simplify spawn logic 2022-05-29 02:34:02 +02:00
cora da6563a5b3 Spawn witch and black cat on witchhut generation 2022-05-29 02:34:02 +02:00