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

8477 Commits (7be8ab2c1c8e5659c03a60d9f6c94793b2abd10d)

Author SHA1 Message Date
cora 3a09405a1c Merge pull request 'Added raw ores to iron and gold ore drops' (#2490) from raw_ore_drops into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2490
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-07-25 22:24:59 +00:00
PrairieAstronomer c6644a3fd1 Change raw ore block cooktime to 90. 2022-07-26 00:23:09 +02:00
PrairieAstronomer 40d993764b Added Raw Ore Block Smelting Recipe 
Added Raw Ore Block Smelting. Also fixed the whitespace in the raw ore init file.
 2022-07-26 00:23:09 +02:00
PrairieAstronomer b2a73f26d7 Added fortune drops to iron and gold ores 2022-07-26 00:23:09 +02:00
PrairieAstronomer e3f8dd158e Added raw ores to iron and gold ore drops 2022-07-26 00:23:09 +02:00
cora 5a90f34edb Merge pull request 'Withering Heights Advancement' (#2492) from wither_advancement into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2492
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-07-25 21:59:27 +00:00
PrairieAstronomer f84063ad0a Withering Heights Advancement 2022-07-25 11:48:38 -06:00
cora a9a8a18b9b Merge pull request 'Add tropical fish' (#2485) from tropical_fish into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2485
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-07-24 22:00:28 +00:00
cora 0b729d7ada Fix wrong drops itemstring 2022-07-24 23:52:42 +02:00
PrairieAstronomer 3aa26cac14 Tropical Fish Bucket 
Adds the bucket of tropical fish.
 2022-07-24 23:52:42 +02:00
cora 3a47e8a2f9 Add tropical fish 2022-07-24 23:52:41 +02:00
cora fe4055c5cf Merge pull request 'Fix mcl_sprint globalstep taking way too long' (#2487) from fix_sprinting_gs into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2487
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-07-24 21:40:20 +00:00
cora 8556226cf7 Move check to the top of the function 2022-07-24 23:38:24 +02:00
cora 323a1f6e18 Fix mcl_sprint globalstep taking long 2022-07-24 12:55:37 +02:00
cora 306c0d99ef Merge pull request 'Next mobs-redo batch' (#2480) from mobs-redo-merge into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2480
 2022-07-24 10:00:17 +00:00
Sumyjkl 5fc662664f cactus will act as if dug instead of its own hardcoded breaking function 2022-07-24 15:59:00 +10:00
Sumyjkl 6278fa21d3 Removed an entire block of code that was duplicate and didn't do anything 2022-07-23 16:41:41 +10:00
Sumyjkl fb28177ff1 items will stay put when loaded, items dug by the game will get more initial random velocity, game will no longer apply random velocity twice (?) 2022-07-23 16:10:52 +10:00
Sumyjkl 65e42845f4 netherite armour no longer burns in lava 2022-07-22 23:18:51 +10:00
Sumyjkl 58d80e5e9c netherite items (except armour) will float in lava and not burn 2022-07-22 23:06:35 +10:00
Sumyjkl eeace260fe don't disable physics if you've already disabled it 2022-07-22 22:45:22 +10:00
Sumyjkl 65fc5b6f28 droppers and dispensers actually shoot items out, items will merge with eachother even when floating 2022-07-22 22:38:36 +10:00
Sumyjkl dc6fbeeafd items will go into sleep mode even if there's a block above as long as it's not a liquid 2022-07-22 16:55:42 +10:00
Sumyjkl 70aca4c3ca fix infinite bobbing 2022-07-22 16:19:50 +10:00
Sumyjkl 9daac0aff1 make items float in water sources 2022-07-22 15:34:58 +10:00
cora acbf043df0 Check 3 nodes above for enderman spawn 2022-07-22 03:27:41 +02:00
cora 2ba1a40820 Add ghasts specific spawning conditions 2022-07-22 03:27:41 +02:00
cora 94f0d679f2 Add can_spawn callback in mob api 2022-07-22 03:27:41 +02:00
cora 32ac2ffeb8 remove unused alias_mob function 2022-07-22 03:27:41 +02:00
Sumyjkl 68e1fdde36 fixed comment about creative 2022-07-22 03:27:41 +02:00
Sumyjkl fbfc53ff42 eat sound will play even when feeding in creative 2022-07-22 03:27:41 +02:00
Sumyjkl d8172e404e wolf when tamed will retain its health and not heal to full hp 2022-07-22 03:27:41 +02:00
Sumyjkl 3852c0297f changed API to recognise sitting order, added animations for sitting and idle, dog will no longer walk around while in sit mode 2022-07-22 03:27:41 +02:00
Sumyjkl c60002b18d set tamed 2022-07-22 03:27:41 +02:00
Sumyjkl 4920ef0fd5 allow wolf to be bred like other animals 2022-07-22 03:27:41 +02:00
cora 96b628d418 Sheep run away when hit 2022-07-22 03:27:41 +02:00
cora 69c689bfb7 make llamas retaliate by spitting. 
it's a bit picky when and how it will spit still but works.
 2022-07-22 03:27:41 +02:00
cora b7a0460b15 Reset aggro when player far 2022-07-22 03:27:41 +02:00
SumianVoice cfb6b6003c Update api.lua 2022-07-22 03:27:41 +02:00
SumianVoice a6eae1e95e don't tame baby animals yet 2022-07-22 03:27:41 +02:00
SumianVoice 682b61ad4a make sure you can't heal and tame at the same time 2022-07-22 03:27:41 +02:00
SumianVoice 524da8a6cb move heal under tame so that you can tame an animal and then heal it, like in MC 2022-07-22 03:27:41 +02:00
SumianVoice e6a97031ef remove unnecessary check 2022-07-22 03:27:41 +02:00
SumianVoice 120b096fc8 move self.food check 2022-07-22 03:27:41 +02:00
SumianVoice 9d52fed357 non-tamable mobs will not send tame param to feed_tame func, 
changed event flow so it tries in order: heal, tame, breed, grow child
 2022-07-22 03:27:41 +02:00
SumianVoice e5c1da4380 make it check not child, since the return statement was removed 2022-07-22 03:27:41 +02:00
SumianVoice a07a5b24bd animals don't take food from player unless it is used for something 2022-07-22 03:27:41 +02:00
SumianVoice c626c977d1 Update api.lua 2022-07-22 03:27:41 +02:00
cora 69d1c26a15 Merge pull request 'mcl_dripping: Fix wrong sound position' (#2471) from dripping_particles into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2471
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-07-21 10:05:57 +00:00
cora e1130a105f fix wrong sound position 2022-07-21 12:03:46 +02:00