FaceDeer
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update from master #1

Merged
FaceDeer merged 53 commits from VoxeLibre/VoxeLibre:master into master 2022-08-29 09:16:33 +02:00
Conversation 0 Commits 53 Files Changed 40 +657 -215

53 Commits

Author SHA1 Message Date
cora 1f2b70cb85 Merge pull request 'Fix crash when using flint and steel on creeper' (#2598) from fix_flint_and_creeper into master 
Reviewed-on: MineClone2/MineClone2#2598
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-28 19:12:21 +00:00
cora 683ace0748 Fix crash when using flint and steel on creeper 2022-08-28 21:10:48 +02:00
cora 7ac2c30622 Merge pull request 'Fix crash with itementity and unloaded nodes' (#2600) from fix_item_crash into master 
Reviewed-on: MineClone2/MineClone2#2600
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-28 19:10:08 +00:00
cora 2b2ba47aed Fix crash with itementity and unloaded nodes 2022-08-28 21:08:17 +02:00
cora 7a6a84b2a2 Merge pull request 'Fix a couple of warnings in grindstone' (#2601) from fix_grindstone_warnings into master 
Reviewed-on: MineClone2/MineClone2#2601
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-28 19:07:17 +00:00
cora c158be848d Grindstone: Fix indentation 2022-08-28 15:06:06 +02:00
cora 5520f81404 Fix grindston warnings 2022-08-28 15:02:02 +02:00
cora d75fdec8f0 Merge pull request 'Fix ender particle spam with particlespammers' (#2593) from fix_enderparticles into master 
Reviewed-on: MineClone2/MineClone2#2593
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-26 20:02:52 +00:00
cora 94f07c2b3d Fix ender particle spam with particlespammers 2022-08-26 21:53:27 +02:00
cora a93bf3bf53 Merge pull request 'Make items not drop into blocks on playerdeath' (#2592) from fix_death_drop into master 
Reviewed-on: MineClone2/MineClone2#2592
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-26 19:31:13 +00:00
cora 0a45486304 Make items not drop into blocks on playerdeath 2022-08-26 02:32:16 +02:00
cora 0385dd7cab Merge pull request 'Fix enchanted tools not being properly upgraded' (#2586) from fix_netherite_upgrade into master 
Reviewed-on: MineClone2/MineClone2#2586
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-25 09:51:06 +00:00
cora 05979ed690 Fix enchanted tools not being properly upgraded 2022-08-25 11:31:08 +02:00
cora 35f064511d Merge pull request 'Fix tropical fish crash (#2583)' (#2587) from fix_tropical_fish_textures into master 
Reviewed-on: MineClone2/MineClone2#2587
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-24 09:01:04 +00:00
cora ccfbc7da14 Make sure math.random gets a >0 argument 2022-08-24 03:01:32 +02:00
cora 6d336ee879 Fix tropical fish empty texture array 2022-08-24 02:55:15 +02:00
cora 26a4b3d895 Merge pull request 'Remove image stack wieldview' (#2333) from MrRar/MineClone2:wieldview into master 
Reviewed-on: MineClone2/MineClone2#2333
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-23 20:06:38 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 71cfa67c7d Fix wieldview in MT 5.6 2022-08-23 10:11:21 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 60f3d4b74c set_attach: remove default parameters 2022-08-23 10:08:22 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 ba55e4286f Remove image stack wieldview: code review improvment 2022-08-23 10:08:22 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 587f9be4d7 Remove image stack wieldview 2022-08-23 10:08:22 -05:00
cora 5d33dc94db Merge pull request 'Fix regression of item movement in water transport streams.' (#2579) from fix_itemflow_regression into master 
Reviewed-on: MineClone2/MineClone2#2579
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-19 21:48:27 +00:00
MysticTempest 6cbedd408e Fix regression of item movement in water transport streams. 2022-08-19 06:53:26 -05:00
cora 4032cbe943 Merge pull request 'Parrot mobimitate: Use proper keyset for randomisation' (#2574) from fix_parrot_crash into master 
Reviewed-on: MineClone2/MineClone2#2574
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-18 21:53:34 +00:00
cora 544c6cbdb3 Use proper keyset for randomisation 2022-08-18 23:49:27 +02:00
PrairieWind 0cd2c3993f Merge pull request 'Added Grindstone Translation Template' (#2577) from grindstone_tr_template into master 
Reviewed-on: MineClone2/MineClone2#2577
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-18 21:10:16 +00:00
PrairieWind 2e5503c12f Added Grindstone Translation Template 2022-08-18 15:03:59 -06:00
cora b0999d89b1 Merge pull request 'Adds grindstone functionality' (#2576) from ChrisPHP/MineClone2:grindstone_gui into master 
Reviewed-on: MineClone2/MineClone2#2576
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-18 20:45:25 +00:00
Chris Page 652632a83d Updated mod.conf description 2022-08-18 20:37:22 +01:00
Chris Page af0f16f4ac Transfers custom name for books now 2022-08-18 20:25:43 +01:00
Chris Page 183830e0a6 Merge branch 'master' into grindstone_gui 2022-08-18 19:59:30 +01:00
Chris Page 9580fdb81b Added enchanted book to disenchant and drop items when destroyed 2022-08-18 19:45:30 +01:00
Chris Page 58d36d4596 Added xp earnt from disenchanting, code comments and updated item description 2022-08-17 21:47:00 +01:00
Chris Page 91a318ac4e Added name and curse transfer 2022-08-16 22:06:49 +01:00
cora 36c933dd5c Merge pull request 'Pillagers' (#2545) from pillagers into master 
Reviewed-on: MineClone2/MineClone2#2545
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-15 23:58:17 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 181eb96c6d Fix up pillagers 2022-08-16 01:53:42 +02:00
PrairieWind 092b746b0b Add Pillager and Evoker Spawning to Pillager Outpost 2022-08-16 01:53:42 +02:00
PrairieAstronomer 24939326c4 Fixed the pillager so he shoots, along with the animation 2022-08-16 01:53:42 +02:00
PrairieAstronomer a48664b8b3 Changed mobs to mcl_mobs in some spots 2022-08-16 01:53:42 +02:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 d7e950ab7b Pillagers: spawn with loaded crossbow 2022-08-16 01:53:42 +02:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 dd96dd097c Basic Pillagers 2022-08-16 01:53:42 +02:00
chmodsayshello 4b2e084c81 Merge pull request 'Update ingame credits' (#2571) from credit_update into master 
Reviewed-on: MineClone2/MineClone2#2571
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2022-08-15 18:17:04 +00:00
chmodsayshello 7ee38fef83 update credits (again) 2022-08-15 14:08:59 +00:00
cora 281e7273ef Merge pull request 'Fix 'spawn_in_group_min' warning' (#2567) from spawn_in_group_warning into master 
Reviewed-on: MineClone2/MineClone2#2567
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-15 10:01:38 +00:00
cora f27b2d9714 Fix 'spawn_in_group_min' warning 2022-08-15 11:58:39 +02:00
cora 8666677ef2 Merge pull request 'Log player position on death' (#2568) from log_player_deathpos into master 
Reviewed-on: MineClone2/MineClone2#2568
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-15 09:57:58 +00:00
cora ba35f19f71 Log player position on death 
So people can find their items easier
 2022-08-15 11:57:11 +02:00
cora c0edc00789 Merge pull request 'make endermen TP out of sunlight' (#2563) from endermen_suntp into master 
Reviewed-on: MineClone2/MineClone2#2563
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-14 20:18:30 +00:00
cora fba63c4721 Merge branch 'master' into endermen_suntp 2022-08-14 20:15:38 +00:00
Chris Page d6a30cacc6 Added grindstone functionality support 2022-08-14 16:49:35 +01:00
cora cb83c34b52 Merge pull request 'registration of mapgen node functions was overwriting previously registered mapgen functions' (#2565) from FaceDeer/MineClone2:master into master 
Reviewed-on: MineClone2/MineClone2#2565
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-14 09:38:17 +00:00
cora ecd1d13b43 Endermen TP out of sunlight 
If not attacking a player endermen randomly tp around until they
find a spot that is not in direct sunlight
 2022-08-13 23:23:01 +02:00
Chris Page a356be5f76 Merge pull request 'Merge with master.' (#1) from MineClone2/MineClone2:master into master 
Reviewed-on: ChrisPHP/MineClone2#1
 2022-08-13 10:14:27 +00:00