Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-17 08:31:08 +01:00
Code Issues Projects Releases Packages Wiki Activity
7319 commits 107 branches 83 tags 188 MiB
Commit graph

1443 commits

Author SHA1 Message Date
jordan4ibanez
bdadbb6be6 Merge pull request 'Add in random sounds/hurt/death sounds and stop mobs from reviving on server restart again' (#1646) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1646
 2021-04-25 05:15:23 +00:00
jordan4ibanez
7733e05a12 Add in random sounds/hurt/death sounds and stop mobs from reviving on server restart again 2021-04-25 01:14:48 -04:00
jordan4ibanez
857434a4ff Merge pull request 'Fix dead-alive mobs and add in hurt/die sound' (#1645) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1645
 2021-04-25 04:17:22 +00:00
jordan4ibanez
0a380265c8 Fix dead-alive mobs and add in hurt/die sound 2021-04-25 00:16:54 -04:00
jordan4ibanez
2c47d2190e Merge pull request 'Enable mob drowning' (#1644) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1644
 2021-04-25 04:06:41 +00:00
jordan4ibanez
8d3eff0c16 Enable mob drowning 2021-04-25 00:06:12 -04:00
jordan4ibanez
24df0271d4 Merge pull request 'Make every mob besides spiders get slowed down by cobwebs like players' (#1643) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1643
 2021-04-25 03:34:44 +00:00
jordan4ibanez
56086bf02b Fix villager 2021-04-24 23:33:46 -04:00
jordan4ibanez
079811984c Make every mob besides spiders get slowed down by cobwebs like players 2021-04-24 23:29:56 -04:00
jordan4ibanez
67deb1b884 Merge pull request 'If mob is in daylight and ignites_in_daylight = true, make mob burn' (#1642) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1642
 2021-04-25 03:16:09 +00:00
jordan4ibanez
7e8e63b0e3 If mob is in daylight and ignites_in_daylight = true, make mob burn 2021-04-24 23:15:40 -04:00
jordan4ibanez
79871ca191 Merge pull request 'Make mobs drop xp on death' (#1641) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1641
 2021-04-25 02:28:57 +00:00
jordan4ibanez
49b01dca4f Make mobs drop xp on death 2021-04-24 22:28:26 -04:00
jordan4ibanez
5ba0d34cd5 Merge pull request 'Fix ghast strange behavior in the nether' (#1640) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1640
 2021-04-25 02:22:26 +00:00
jordan4ibanez
3d5cceab76 Fix ghast strange behavior in the nether 2021-04-24 22:21:58 -04:00
jordan4ibanez
b937b20158 Merge pull request 'Give mobs 6 seconds of memory to prevent strange behavior when player hides behind something' (#1639) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1639
 2021-04-25 02:14:53 +00:00
jordan4ibanez
a73e5b57c0 Make pitch movement for fly/swim mobs more dynamic and make ghasts randomly fly around when attacking 2021-04-24 22:14:25 -04:00
jordan4ibanez
b401b50c04 Give mobs 6 seconds of memory to prevent strange behavior when player hides behind something 2021-04-24 21:15:42 -04:00
jordan4ibanez
81315838d5 Merge pull request 'Make spiders climb up walls, fix problems with mob following freaking out when under, fix spider collisionbox' (#1638) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1638
 2021-04-25 00:28:13 +00:00
jordan4ibanez
807fb6966d Make spiders climb up walls, fix problems with mob following freaking out when under, fix spider collisionbox 2021-04-24 20:27:37 -04:00
jordan4ibanez
1d8fbdc386 Merge pull request 'Remove need to sneak click for breeding certain animals, enable llama carpets, enable llama chests (no op)' (#1637) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1637
 2021-04-25 00:06:24 +00:00
jordan4ibanez
11b5684a90 Remove wolf-dog shift click breeding, and implement better logic 2021-04-24 20:05:14 -04:00
jordan4ibanez
41bfaae370 Allow putting chest on carpeted llama by owner, enable swapping carpets 2021-04-24 20:02:59 -04:00
jordan4ibanez
8c855f5b09 Add in llama carpets 2021-04-24 19:29:37 -04:00
jordan4ibanez
e0185a9311 Fix pig logic issue 2021-04-24 18:43:17 -04:00
jordan4ibanez
c2cb15a47f Fix horse breeding 2021-04-24 18:36:22 -04:00
jordan4ibanez
231d6c90b5 Merge pull request 'Update api.txt' (#1636) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1636
 2021-04-24 22:20:17 +00:00
jordan4ibanez
39f7d0cf3c Update api.txt 2021-04-24 18:18:53 -04:00
jordan4ibanez
05fcad6db3 Merge pull request 'Fix enderman crashing' (#1635) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1635
 2021-04-24 22:07:43 +00:00
jordan4ibanez
3e9bbca914 Fix enderman crashing 2021-04-24 18:06:24 -04:00
jordan4ibanez
4add3b286c Merge pull request 'Overhaul breeding' (#1633) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1633
 2021-04-24 04:40:00 +00:00
jordan4ibanez
81713a342d Allow tamed wolves to be shift click bred 2021-04-24 00:38:50 -04:00
jordan4ibanez
a27e6731cd Make sheep breedable 2021-04-24 00:29:30 -04:00
jordan4ibanez
efce97c172 Make llamas shift click breedable 2021-04-24 00:27:17 -04:00
jordan4ibanez
53c96cae2d Make pigs shift click breedable 2021-04-24 00:26:45 -04:00
jordan4ibanez
dbe712bc17 Make llama breedable 2021-04-24 00:23:33 -04:00
jordan4ibanez
0d4d85bac6 Fix horse literally blinding you following you 2021-04-24 00:19:41 -04:00
jordan4ibanez
6f2e2ab4c5 Make chicken breedable 2021-04-24 00:17:22 -04:00
jordan4ibanez
3649e5f6f5 Make horse breedable 2021-04-24 00:17:09 -04:00
jordan4ibanez
2dab0773df Remove unused breedable api call 2021-04-24 00:00:21 -04:00
jordan4ibanez
0568c14a43 Fix timer and make mooshroom breedable 2021-04-23 23:59:35 -04:00
jordan4ibanez
531253008a Complete mob breeding, make cows breedable 2021-04-23 23:56:59 -04:00
jordan4ibanez
79cb6ddc49 Fix lua locals in environment.lua 2021-04-23 22:35:35 -04:00
jordan4ibanez
6eb3eef215 Fix typo in function 2021-04-23 22:34:40 -04:00
jordan4ibanez
c37a82d4a2 Add comments 2021-04-23 22:03:29 -04:00
jordan4ibanez
ed9d629b99 Add in mob following for cows 2021-04-23 21:59:42 -04:00
jordan4ibanez
fcfd6b9d19 Set up basics for breeding mechanics 2021-04-23 21:14:23 -04:00
jordan4ibanez
d2a7298095 Merge pull request 'Implement mob despawner/mob limiter' (#1632) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1632
 2021-04-23 23:53:29 +00:00
jordan4ibanez
5ee6cf6c9b Implement mob despawner/mob limiter 2021-04-23 19:49:35 -04:00
jordan4ibanez
23f7801e3f Merge pull request 'Stop hostile mobs from falling through water when stunned' (#1631) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1631
 2021-04-23 22:42:11 +00:00
jordan4ibanez
19c8dd1dd4 Stop hostile mobs from falling through water when stunned 2021-04-23 18:41:41 -04:00
jordan4ibanez
ae2a539d85 Merge pull request 'Re-enable mob spawning and neutral mob switch' (#1630) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1630
 2021-04-23 22:35:14 +00:00
jordan4ibanez
31ded5e40f Re-implement neutral mob switch 2021-04-23 18:34:20 -04:00
jordan4ibanez
13c321e8f2 Re-enable mob spawning 2021-04-23 18:03:01 -04:00
jordan4ibanez
f7ed71bcdc Merge pull request 'Don't do knockback effect for mobs when hurt by a rider' (#1629) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1629
 2021-04-23 21:45:13 +00:00
jordan4ibanez
ea6912c980 Don't do knockback effect for mobs when hurt by a rider 2021-04-23 17:44:49 -04:00
jordan4ibanez
11785a9434 Merge pull request 'Make mobs run away slightly faster' (#1628) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1628
 2021-04-23 21:37:47 +00:00
jordan4ibanez
8dafac50a8 Make mobs run away slightly faster 2021-04-23 17:37:20 -04:00
jordan4ibanez
129987a38e Merge pull request 'Remove unused code and variables from mob punch' (#1627) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1627
 2021-04-23 21:29:55 +00:00
jordan4ibanez
3560bda4a5 Remove unused code and variables from mob punch 2021-04-23 17:29:23 -04:00
jordan4ibanez
a6dae8e5a8 Merge pull request 'Color modifier for punched mobs and fixing breaking velocity when punched' (#1626) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1626
 2021-04-23 21:28:03 +00:00
jordan4ibanez
9720986c4d Fix punching a mob breaking it's velocity 2021-04-23 17:27:08 -04:00
jordan4ibanez
dc7592528c Add red tint hurt effect 2021-04-23 17:23:00 -04:00
jordan4ibanez
9486d1bf23 Merge pull request 'Fix ocelots and add in skittish mob behavior' (#1625) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1625
 2021-04-23 21:13:01 +00:00
jordan4ibanez
304cbed447 Make mobs that should be skittish, skittish 2021-04-23 17:12:02 -04:00
jordan4ibanez
af4c42fea7 Add skittish behavior (runaway from punch) and fix ocelot 2021-04-23 17:10:44 -04:00
jordan4ibanez
8daf197fb8 Fix iron golem rotation 2021-04-23 16:52:07 -04:00
jordan4ibanez
c138050e0b Make iron golem neutral and protective, fix rotation 2021-04-23 16:45:12 -04:00
jordan4ibanez
d04e694d1a Merge pull request 'Stop dead mobs from getting in the way of fighting other mobs' (#1623) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1623
 2021-04-23 20:35:52 +00:00
jordan4ibanez
36d5af1d15 Stop dead mobs from getting in the way of fighting other mobs 2021-04-23 16:35:16 -04:00
jordan4ibanez
db0e3a389d Merge pull request 'Two fixes to mobs' (#1622) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1622
 2021-04-23 20:31:48 +00:00
jordan4ibanez
73b4d3c1d2 stop projectile mobs from being completely disabled while stunned 2021-04-23 16:31:13 -04:00
jordan4ibanez
eb7ae5e10e Fix random crash 2021-04-23 16:28:30 -04:00
jordan4ibanez
43fdc08030 Merge pull request 'Add new mob hit sounds' (#1621) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1621
 2021-04-23 20:23:09 +00:00
jordan4ibanez
c831da2c02 Fix mobs not making hit sound when hit by node 2021-04-23 16:22:34 -04:00
jordan4ibanez
d5a38fef58 Add in new mob punched sounds 2021-04-23 16:19:37 -04:00
jordan4ibanez
8ea546abfb Merge pull request 'Overhaul horse' (#1620) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1620
 2021-04-23 20:04:44 +00:00
jordan4ibanez
8e7ce5a72a Add in a visual for horse taming (hearts) 2021-04-23 16:04:01 -04:00
jordan4ibanez
189c0ad157 Half finish horse (riding logic, etc) 2021-04-23 15:53:01 -04:00
jordan4ibanez
53fb683d33 Merge pull request 'Fix llama blaze and ghast projectile sprites' (#1619) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1619
 2021-04-23 18:51:05 +00:00
jordan4ibanez
f64f8e31e3 Fix llama blaze and ghast projectile sprites 2021-04-23 14:50:38 -04:00
jordan4ibanez
7faf2460b7 Merge pull request 'Fixes to mobs' (#1618) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1618
 2021-04-23 18:50:10 +00:00
jordan4ibanez
58bee2a2dd Fix projectile tails clipping through sprite 2021-04-23 14:43:00 -04:00
jordan4ibanez
16cc7e37d2 Randomize projectile cooldown timer 2021-04-23 14:34:59 -04:00
jordan4ibanez
8eb9ba12ce Fix crash when mob collides with nil entity 2021-04-23 14:33:40 -04:00
jordan4ibanez
d231edbb43 Merge pull request 'Massive overhaul to projectile mobs with custom projectile function, make llamas spit' (#1617) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1617
 2021-04-23 18:10:52 +00:00
jordan4ibanez
5d59583583 Massive overhaul to projectile mobs with custom projectile function, make llamas spit 2021-04-23 14:10:12 -04:00
jordan4ibanez
adeea8ed43 Merge pull request 'Fix enderman' (#1616) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1616
 2021-04-23 17:36:16 +00:00
jordan4ibanez
f6fa90096d Fix enderman teleport attack 2021-04-23 13:35:30 -04:00
jordan4ibanez
4fb9e69e41 Make enderman become hostile when stared at, freeze when attacking when stared at 2021-04-23 13:27:17 -04:00
jordan4ibanez
99f13f84b5 Half-fix enderman 2021-04-23 13:13:23 -04:00
jordan4ibanez
3788886518 Merge pull request 'Fix wolves and make chickens slow fall' (#1614) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1614
 2021-04-23 17:07:11 +00:00
jordan4ibanez
dd76b15c50 Make ghasts not insta-kill 2021-04-23 13:06:57 -04:00
jordan4ibanez
b6f19699e9 Make enderdragon half work 2021-04-23 13:06:17 -04:00
jordan4ibanez
4efec1ef58 Add in chicken slow falling 2021-04-23 12:55:11 -04:00
Elias Fleckenstein
988a44148e Merge branch 'master' into mineclone5 2021-04-23 18:11:41 +02:00
Elias Fleckenstein
a03e7f6f3a Re-enable player ignition from lava 2021-04-23 13:46:20 +02:00
Elias Fleckenstein
78355c5c57 Integrate totems 2021-04-23 13:40:51 +02:00
jordan4ibanez
0895666407 Fix random crash with mixed mob ally data types 2021-04-22 23:36:58 -04:00
jordan4ibanez
408296140a Fix and overhaul wolves 2021-04-22 23:30:32 -04:00
jordan4ibanez
aac1e19336 Implement rotation locking when standing, fix rotation unlock/lock for fly/swim mobs 2021-04-22 23:18:33 -04:00
jordan4ibanez
fa059b5df2 Fix ghast's eyeheight 2021-04-22 22:59:03 -04:00
jordan4ibanez
2e3e92e393 Fix ghast's insane difficulty 2021-04-22 22:58:32 -04:00
jordan4ibanez
11bcf3aa34 Add attributes to epCode 2021-04-22 22:51:13 -04:00
jordan4ibanez
2099be43ea Update to epCode's fixed version of ghast model 2021-04-22 22:50:14 -04:00
jordan4ibanez
5037ec3736 Fix ghasts horrible collisionbox 2021-04-22 22:40:16 -04:00
jordan4ibanez
0a8fff6524 Add in mob criticals when falling 2021-04-22 22:08:54 -04:00
jordan4ibanez
afdcada1fd Fix endermite 2021-04-22 21:46:13 -04:00
jordan4ibanez
5d876725c5 Fix bats 2021-04-22 21:45:00 -04:00
jordan4ibanez
ef0d52a2df Update backup_code_api.lua 2021-04-22 21:41:54 -04:00
jordan4ibanez
8142f7e512 Add in mob death 2021-04-22 21:36:42 -04:00
jordan4ibanez
ebf27866ca Fix typo and error in animation.lua 2021-04-22 21:12:08 -04:00
jordan4ibanez
3fe8d2d3c5 Add file death_logic.lua 2021-04-22 20:30:50 -04:00
jordan4ibanez
b73ab976a1 Implement framework for mob death 2021-04-22 20:25:58 -04:00
jordan4ibanez
8530e6ee36 Make mob punching time based 2021-04-22 20:20:56 -04:00
jordan4ibanez
e1812b2cdb Reset pause timer to 0 2021-04-22 20:12:02 -04:00
jordan4ibanez
991bba0a1d Add comments into ai.lua 2021-04-22 20:10:01 -04:00
jordan4ibanez
f9a7144b65 Implement ability to hurt mobs 2021-04-22 20:07:30 -04:00
jordan4ibanez
45790c0be0 Re-enable mob punching (broken) 2021-04-22 19:12:02 -04:00
jordan4ibanez
31a791c33b Undo debug.txt spam from mob spawning 2021-04-22 18:20:58 -04:00
jordan4ibanez
d0d128c1d8 Break infinite loop if unable to find any mob to spawn 2021-04-22 18:18:57 -04:00
jordan4ibanez
ee905642c2 Add temporary warning debug to spawning algorithm output 2021-04-22 17:56:38 -04:00
jordan4ibanez
2cef9e7cca Optimize mob spawning even further with additional lua locals 2021-04-22 00:39:32 -04:00
jordan4ibanez
edb1939649 Fix mob_counter in mob spawning limiter 2021-04-22 00:27:35 -04:00
jordan4ibanez
7c1adeab45 Hyper-optimize mob spawning 2021-04-22 00:20:57 -04:00
jordan4ibanez
ecebe0253c Merge branch 'mineclone5' into mineclone5 2021-04-22 03:29:18 +00:00
jordan4ibanez
fbe3ccc5c0 Delete current state of things comment 2021-04-21 23:28:38 -04:00
jordan4ibanez
e398aca747 Merge pull request 'Fix sheep and pig rotation' (#1592) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1592
 2021-04-22 03:26:27 +00:00
jordan4ibanez
5e15af260b Fix pig rotation 2021-04-21 23:25:19 -04:00
jordan4ibanez
6aa6364492 Fix sheep rotation 2021-04-21 23:25:10 -04:00
kay27
7c2ea8d7f0 [mineclone5] Merge backup_code_api.lua from latest mineclone5 and playerplus from master 2021-04-22 01:16:22 +04:00
jordan4ibanez
29305f548d Overhaul arrow register, implement basic blaze, break parts of arrow register for now, remove fallback for detecting players 2021-04-21 15:08:35 -04:00
jordan4ibanez
08c90c34e8 Make parrots and squids work with tilt fly/swim 2021-04-21 13:05:46 -04:00
jordan4ibanez
91099c3be9 Fix auto-true statement for tilt fly/swim 2021-04-21 13:01:14 -04:00
jordan4ibanez
71c34823bc Make tilt flying/swimming dynamic 2021-04-21 12:56:36 -04:00
jordan4ibanez
20886f54bb Make shooty mobs jump 2021-04-21 12:48:23 -04:00
jordan4ibanez
ebd995fbd2 Simplify skeleton arrow damage calculation 2021-04-21 12:45:02 -04:00
jordan4ibanez
c9f71d66f5 Implement skeletons/strays 2021-04-21 12:42:34 -04:00
jordan4ibanez
99e808296b Add missing skeleton/stray run animation 2021-04-21 12:17:51 -04:00
jordan4ibanez
74094938bb Fix crash with non-punch attack mobs in collision 2021-04-21 12:10:29 -04:00
jordan4ibanez
6bd279255c Fully implement zombie pigmen 2021-04-21 11:50:22 -04:00
jordan4ibanez
964ce9ccf7 Temporarily disable spawn eggs from setting owner 2021-04-21 11:42:01 -04:00
jordan4ibanez
5062d56a5d Implement neutral mob mechanics and partial implement of zombie pigmen 2021-04-21 11:00:02 -04:00
jordan4ibanez
b0b1ec9436 Implement zombie pigmen and make them turn hostile when punched 2021-04-21 10:53:20 -04:00
jordan4ibanez
f1dc286442 Dump mob_punch from backup_code_api.lua back into interaction.lua 2021-04-21 10:23:51 -04:00
jordan4ibanez
cc2a0ae52c Complete charged creeper 2021-04-21 10:21:11 -04:00
jordan4ibanez
486959515c Make creepers even more dangerous 2021-04-21 10:20:31 -04:00
Elias Fleckenstein
1e7ba2b605 Merge branch 'master' into damage 2021-04-21 11:32:50 +02:00
Elias Fleckenstein
fe5f61c747 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-21 11:31:53 +02:00
Elias Fleckenstein
f3c4dd699d Merge branch 'master' into mineclone5 2021-04-21 11:31:39 +02:00