1
0
Fork 0

Compare commits

...

117 Commits

Author SHA1 Message Date
Lizzy Fleckenstein d5434bf008 Fix that fucking mending armor crash 2021-05-18 16:34:37 +02:00
cora 15fb401497 fix creeper explosion timer 2021-05-17 23:45:23 +02:00
cora 48946339c5 revert charged creeper explosion too 2021-05-13 00:31:43 +02:00
cora edf9e38d4f revert insane creeper explosions 2021-05-12 23:52:17 +02:00
kay27 1a9990fc92 [mcl_mobspawners] Fix random crash, MineClone2/MineClone2#1707 2021-05-09 19:13:06 +04:00
kay27 b64188f37e Merge commit history 2021-05-09 00:55:12 +00:00
kay27 bd455a3eee Merge weekly changes --before=1619916909 as a squash 2021-05-09 00:55:12 +00:00
Lizzy Fleckenstein 7096677d2e Fix heads crash 2021-05-04 08:52:53 +02:00
kay27 b488064058 Merge commit '956dab78ceb49aaed98f12b6b88acc3efac81957' into production 2021-04-26 00:35:36 +00:00
kay27 38c4869b7f Merge (latest mcl_tools/init.lua) 2021-04-26 00:35:23 +00:00
Doloment 819dbc6224 Added LBM 2021-04-26 00:34:35 +00:00
NO11 4b2a82e5b8 Remove old crafting recipes 2021-04-26 00:34:35 +00:00
NO11 661c80bd1d Summarize all debarked types of wood 2021-04-26 00:34:35 +00:00
NO11 e73cb56085 Fix lying trunks that stand upright again after debarking 2021-04-26 00:34:35 +00:00
kay27 0a6c3a4414 Merge (latest mcl_enchanting) 2021-04-26 00:34:15 +00:00
AFCMS b21c43e38c performance optimisation 2021-04-26 00:33:27 +00:00
AFCMS 8dda13f143 remove unuseful code 2021-04-26 00:33:27 +00:00
Elias Åström 731dc4947b Fix efficiency and unbreaking not working together
This commit fixes an issue were tools enchanted with both efficiency and
unbreaking would loose the effect of one of the enchantments in some
conditions.
2021-04-26 00:33:27 +00:00
kay27 91762f24b6 Merge (latest mcl_mobs/api.lua) 2021-04-26 00:33:12 +00:00
kay27 975be19f50 Merge (latest mcl_mobs/api.lua) 2021-04-26 00:32:35 +00:00
kay27 23150d60ac Merge (latest playerplus) 2021-04-26 00:31:53 +00:00
kay27 36bd151398 Merge (latest playerplus) 2021-04-26 00:31:26 +00:00
kay27 d66671ae76 Merge (latest playerplus) 2021-04-26 00:30:14 +00:00
kay27 75f20eb3a5 Merge (latest playerplus) 2021-04-26 00:29:35 +00:00
NO11 5fd5ebe4d4 Fix that an ax wears out if you right-click another block 2021-04-26 00:29:06 +00:00
AFCMS 05ba837de4 fix many warnings (644 remaining) 2021-04-26 00:29:06 +00:00
AFCMS 3722d2e8fe fix more codestyle 2021-04-26 00:29:06 +00:00
kay27 7e6abe8398 Merge (latest .luacheckrc) 2021-04-26 00:28:47 +00:00
Lizzy Fleckenstein 64a15d1eea Improve mcl_burning player performance 2021-04-26 00:28:25 +00:00
Lizzy Fleckenstein 28c12df6cd Change max mcl_bossbars default to 5 (Minecraft value) 2021-04-26 00:28:25 +00:00
kay27 61a6929c40 Merge (latest mcl_mobs/api.lua) 2021-04-26 00:28:08 +00:00
Lizzy Fleckenstein f94ab6c8a5 Massive mcl_burning performance improvement 2021-04-26 00:27:25 +00:00
AFCMS 9a6331adde Fix #1570 2021-04-26 00:27:25 +00:00
AFCMS 2fa7e870ee fix many codestyle issues 2021-04-26 00:27:25 +00:00
kay27 7683fa6a17 Merge (latest .luacheckrc) 2021-04-26 00:27:10 +00:00
AFCMS dc5bac8d86 fix warning 2021-04-26 00:26:44 +00:00
jordan4ibanez f08ada08eb Re-enable mob-despawner 2021-04-26 00:26:44 +00:00
epCode 234a9cc746 Fix female player model for footglitch/elytra 2021-04-26 00:26:44 +00:00
epCode 397f22b907 Fix glitch with Stray 2021-04-26 00:26:44 +00:00
AFCMS 597b66ddcb fix excedent lines 2021-04-26 00:26:44 +00:00
kay27 46379b924d Merge (latest playerplus) 2021-04-26 00:26:19 +00:00
kay27 753795dfcd Merge (latest villager_zombie) 2021-04-26 00:25:34 +00:00
epCode 5aac1e71cb Allow zombie villager to have visual armor 2021-04-26 00:24:52 +00:00
AFCMS 81844f8f74 delete unused file 2021-04-26 00:24:52 +00:00
AFCMS ed72a7075f create python script 2021-04-26 00:24:52 +00:00
kay27 22d815dff5 Merge (latest .luacheckrc) 2021-04-26 00:24:34 +00:00
kay27 f6ef8738e6 Merge (latest mcl_core/functions.lua) 2021-04-26 00:23:36 +00:00
NO11 6fcf9b7343 Make cactus destroy items 2021-04-26 00:22:42 +00:00
AFCMS 2edc96f1f4 add basic .luacheckrc file 2021-04-26 00:22:42 +00:00
Nils Dagsson Moskopp bee4dc4854 Show preview of new banner pattern when crafting it 2021-04-26 00:22:42 +00:00
epCode e3d5b8a94c Make Zmbs, Husks, Sklys, Strys, and WthrSklys support armor textures. 2021-04-26 00:22:42 +00:00
kay27 b04f83ae18 Merge (latest mcl_doors.de.tr) 2021-04-26 00:22:24 +00:00
Benjamin Schötz 45b6ad5e2f Fixes typos, grammar errors, and some translation flaws in several german translation files. 2021-04-26 00:21:40 +00:00
epCode 71efdb6744 Partialy fix #1559 2021-04-26 00:21:40 +00:00
Lizzy Fleckenstein b7c68e776c Add global smoke spawning API 2021-04-26 00:21:39 +00:00
j1233 989acf889e credit me
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_fireworks/README.txt#L3
2021-04-26 00:21:39 +00:00
j1233 f8b61b9688 credit me
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_fireworks/README.txt#L3
2021-04-26 00:21:39 +00:00
Lizzy Fleckenstein 873e6f6aa4 Move @Code-Sploit to devs section 2021-04-26 00:21:39 +00:00
kay27 b064688b14 Merge (latest playerplus) 2021-04-26 00:19:02 +00:00
kay27 51ebe823b0 Merge (latest playerplus) 2021-04-26 00:15:57 +00:00
kay27 41703589be Merge (latest playerplus) 2021-04-26 00:15:23 +00:00
kay27 7ba50bb548 Merge (latest playerplus) 2021-04-26 00:14:24 +00:00
NO11 d9792ea688 fix typo 2021-04-26 00:11:21 +00:00
jordan4ibanez f95efc61de Add lua locals into mcl_dungeons for performance 2021-04-26 00:11:21 +00:00
kay27 91611e58fb Merge 2021-04-22 22:58:41 +00:00
kay27 7bc50b5946 Merge 2021-04-22 22:57:49 +00:00
kay27 436c0cda2f Merge 2021-04-22 22:56:42 +00:00
NO11 1aca9b4529 add rocket texture (pixel perfection) 2021-04-22 22:55:45 +00:00
NO11 58edb17baf add german translation 2021-04-22 22:55:45 +00:00
NO11 0002b91673 Dateien hochladen nach „mods/ITEMS/mcl_fireworks/sounds“ 2021-04-22 22:55:45 +00:00
NO11 ebab220fb2 add rocket for elytra boost 2021-04-22 22:55:45 +00:00
kay27 9bda091970 Merge 2021-04-22 22:55:03 +00:00
epCode b31f13d296 make elytra activate mor MC-like 2021-04-22 22:52:41 +00:00
kay27 9859714d92 Merge commit '422385ad028f48849e16e9981922d72108cc7ec6' into production 2021-04-20 18:01:02 +00:00
kay27 fd8540ed5c Merge overlay files from master 2021-04-20 18:00:41 +00:00
kay27 79889ee375 Merge overlay files from master 2021-04-20 17:57:07 +00:00
kay27 486b7a87bb Merge overlay files from master 2021-04-20 17:54:46 +00:00
NO11 1abcd90020 delete old overlay 2021-04-20 17:53:50 +00:00
kay27 a25edff3ff Merge overlay files from master 2021-04-20 17:53:08 +00:00
NO11 75ee0dabfb new overlays 2021-04-20 17:52:33 +00:00
Lizzy Fleckenstein 0b8e152c0a Remove obsolete faithful flavor 2021-04-20 17:43:45 +00:00
Lizzy Fleckenstein 7504e547da Restore info about bonus features 2021-04-20 17:43:45 +00:00
NO11 862fa5fb2b delete old overlay 2021-04-20 17:43:44 +00:00
NO11 31e2b0f010 delete old overlay 2021-04-20 17:43:44 +00:00
NO11 8ae06042df delete old overlay 2021-04-20 17:43:44 +00:00
NO11 e34a32a62e delete old overlay 2021-04-20 17:43:44 +00:00
NO11 a26801b2cd delete old overlay 2021-04-20 17:43:44 +00:00
NO11 e9260218d3 delete old overlay 2021-04-20 17:43:44 +00:00
Code-Sploit eb80cceb8d Fix #1548 2021-04-20 17:43:44 +00:00
kay27 99bb492147 Fix screwdriver/door duplication glitch, MineClone2/MineClone2#1149 2021-04-20 17:43:44 +00:00
Code-Sploit 412813e5a5 Fix #1538 2021-04-20 17:43:44 +00:00
Lizzy Fleckenstein db2fd7497f Rewrite mcl_torches API 2021-04-20 17:43:43 +00:00
Lizzy Fleckenstein 769e348133 Add timeout to static hudbars 2021-04-20 17:43:43 +00:00
epCode 9a00b15f46 Add elytra (sprint in air to use) 2021-04-20 17:43:43 +00:00
kay27 794fa15405 Merge commit '5028728fbcce7fc1925496675a13c7bb421a09c2' into production 2021-04-19 18:44:57 +00:00
kay27 f89513a285 Merge commit '6f770bc962c5c68714b87ec31cd053414074f102' into production 2021-04-19 18:44:57 +00:00
kay27 e2af72f0f0 Merge commit '688794871846ca4b6053999491a48628db73dfa0' into production 2021-04-19 18:44:57 +00:00
kay27 a671a00319 Merge commit 'f540bc2bb1c7e5498c63edad70fa186ab298e292' into production 2021-04-19 18:44:57 +00:00
kay27 126a21acd2 Merge commit '5fb791335557f938c1bd2e2249afdfa11a358ae5' into production 2021-04-19 18:44:57 +00:00
kay27 533e499a4d Merge commit 'd3a325356347664ed8dac04af9707dd34553b40d' into production 2021-04-19 18:44:56 +00:00
kay27 e2860cb885 Merge commit 'c3868084af93d3ab345cbc02a504d5ee9e515230' into production 2021-04-19 18:44:56 +00:00
kay27 e21976320a Merge commit '0d5933b95edfd9012593513734bc8df5fd08cbb4' into production 2021-04-19 18:44:56 +00:00
kay27 9300b35bda Merge commit '615b15f1331d34c1b5c8e339cc025309b13eecca' into production 2021-04-19 18:44:56 +00:00
kay27 416d0aa12d Merge commit 'ed7099fefc3f0091426cc2b61c9bb19ed8b96846' into production 2021-04-19 18:44:56 +00:00
kay27 50bd7e58ef Merge commit 'db5626fcb480a7ec3fcb1b2dd064cf8b14d2a260' into production 2021-04-19 18:44:56 +00:00
kay27 a2e0ddff92 Merge commit '523a0c54d6ca9cc069d8ca767adf19596b4655f1' into production 2021-04-19 18:44:56 +00:00
kay27 e1705ff39f Merge commit 'e0feba115dde0a867008042eb90c801804d1d305' into production 2021-04-19 18:44:56 +00:00
kay27 609ea7a1f8 Merge commit 'b914e088cc93100437517e4f58ce5a7dea411c7b' into production 2021-04-19 18:44:56 +00:00
kay27 590f82ee88 Merge commit '51f121d5166670712f9c32b733c64d848b4f2ac7' into production 2021-04-19 18:44:56 +00:00
kay27 1bcb971f0c Merge commit '1e17989ef28696fe69ab16467a1db8ef9488bad3' into production 2021-04-19 18:44:55 +00:00
jordan4ibanez 96dbfa30a2 Add mod.conf to mcl_fireworks 2021-04-19 10:00:07 +04:00
jordan4ibanez 123802c77a Fix crashing with unknown slot description when enchanting 2021-04-19 09:59:59 +04:00
kay27 622028171c [mcl_portals] Better NP search, no more teleports on the roof, fix MineClone2/MineClone2#1560 2021-04-19 00:09:28 +04:00
Lizzy Fleckenstein 90a54104e8 Add time_of_day to get_light crash fix 2021-04-18 14:50:08 +02:00
Lizzy Fleckenstein 409e48f068 Fix get_light crash 2021-04-18 14:49:58 +02:00
Lizzy Fleckenstein 7e37f74339 Fix crash in mcl_bossbars.remove_bar 2021-04-12 17:56:11 +02:00
Lizzy Fleckenstein ab0b647b26 Localize c_x and c_y in mcl_playerplus 2021-04-12 14:54:32 +02:00
3 changed files with 9 additions and 12 deletions

View File

@ -43,11 +43,11 @@ mobs:register_mob("mobs_mc:creeper", {
eye_height = 1.25,
--hssssssssssss
explosion_strength = 10,
explosion_radius = 4,
explosion_damage_radius = 6,
explosion_strength = 3,
explosion_radius = 3.5,
explosion_damage_radius = 3.5,
explosiontimer_reset_radius = 6,
reach = 1.5,
reach = 3,
defuse_reach = 4,
explosion_timer = 0.3,
allow_fuse_reset = true,
@ -182,9 +182,9 @@ mobs:register_mob("mobs_mc:creeper_charged", {
runaway_from = { "mobs_mc:ocelot", "mobs_mc:cat" },
attack_type = "explode",
explosion_strength = 24,
explosion_radius = 12,
explosion_damage_radius = 18,
explosion_strength = 6,
explosion_radius = 3,
explosion_damage_radius = 6,
explosiontimer_reset_radius = 10,
reach = 1.5,
defuse_reach = 4,

View File

@ -275,10 +275,6 @@ function mcl_experience.add_experience(player, experience)
end
stack:set_wear(math.floor(new_wear))
inv:set_stack(list, index, stack)
if can.list == "armor" then
local armor_inv = minetest.get_inventory({type = "detached", name = player:get_player_name() .. "_armor"})
armor_inv:set_stack(list, index, stack)
end
end
local old_bar, old_xp, old_level = temp_pool.bar, temp_pool.xp, temp_pool.level

View File

@ -54,6 +54,7 @@ local spawn_count_overrides = {
local function set_doll_properties(doll, mob)
local mobinfo = minetest.registered_entities[mob]
if not mobinfo then return end
local xs, ys
if doll_size_overrides[mob] then
xs = doll_size_overrides[mob].x
@ -95,7 +96,7 @@ All the arguments are optional!
* Mob: ID of mob to spawn (default: mobs_mc:pig)
* MinLight: Minimum light to spawn (default: 0)
* MaxLight: Maximum light to spawn (default: 15)
* MaxLight: Maximum light to spawn (default: 15)
* MaxMobsInArea: How many mobs are allowed in the area around the spawner (default: 4)
* PlayerDistance: Spawn mobs only if a player is within this distance; 0 to disable (default: 15)
* YOffset: Y offset to spawn mobs; 0 to disable (default: 0)