From bab31d6cd72b9f6ee454dfb23d42d447a063349a Mon Sep 17 00:00:00 2001 From: kay27 Date: Sun, 25 Jul 2021 14:53:23 +0400 Subject: [PATCH 1/3] Remove release keys from mod.conf to pass ContentDB validation --- mods/ITEMS/mcl_copper/mod.conf | 2 -- mods/ITEMS/mcl_deepslate/mod.conf | 1 - mods/ITEMS/mcl_raw_ores/mod.conf | 3 --- mods/ITEMS/mcl_spyglass/mod.conf | 2 -- 4 files changed, 8 deletions(-) diff --git a/mods/ITEMS/mcl_copper/mod.conf b/mods/ITEMS/mcl_copper/mod.conf index a99acb546..dde96263a 100644 --- a/mods/ITEMS/mcl_copper/mod.conf +++ b/mods/ITEMS/mcl_copper/mod.conf @@ -2,5 +2,3 @@ name = mcl_copper author = NO11 depends = mcl_core, mcl_sounds, mcl_stairs description = Adds Copper Ore, blocks and items. -release = 8283 -title = Mineclone2 Copper diff --git a/mods/ITEMS/mcl_deepslate/mod.conf b/mods/ITEMS/mcl_deepslate/mod.conf index f540a3103..c641e695b 100644 --- a/mods/ITEMS/mcl_deepslate/mod.conf +++ b/mods/ITEMS/mcl_deepslate/mod.conf @@ -2,6 +2,5 @@ name = mcl_deepslate author = NO11 depends = mcl_raw_ores, mcl_core, mcl_sounds, mcl_dye, mcl_util, screwdriver, mobs_mc, walkover, mcl_walls, mcl_stairs, mcl_brewing, mcl_mobitems, mcl_furnaces, mcl_farming, mcl_worlds optional_depends = mcl_copper -release = 8448 description = Adds 29 new deepslate blocks! title = Mineclone2 New Ores and Deepslate diff --git a/mods/ITEMS/mcl_raw_ores/mod.conf b/mods/ITEMS/mcl_raw_ores/mod.conf index 4214b535e..2b74acdf0 100644 --- a/mods/ITEMS/mcl_raw_ores/mod.conf +++ b/mods/ITEMS/mcl_raw_ores/mod.conf @@ -2,6 +2,3 @@ name = mcl_raw_ores author = NO11 depends = mcl_core description = Adds raw iron and raw gold. - -release = 8218 -title = Mineclone2 Raw Ores diff --git a/mods/ITEMS/mcl_spyglass/mod.conf b/mods/ITEMS/mcl_spyglass/mod.conf index db12043f9..965e6a73b 100644 --- a/mods/ITEMS/mcl_spyglass/mod.conf +++ b/mods/ITEMS/mcl_spyglass/mod.conf @@ -3,5 +3,3 @@ author = NO11 description = This mod adds a spyglass, which is an item that can be used for zooming in on specific locations. depends = mcl_core, controls, xpanes optional_depends = mcl_copper -release = 7901 -title = Mineclone2 Spyglass From 8661faa612c6014758007732b5ca01c477f52928 Mon Sep 17 00:00:00 2001 From: FinishedFragment Date: Sun, 25 Jul 2021 11:26:58 +0000 Subject: [PATCH 2/3] Add missing word --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ce924ec58..f3a567dc9 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ The MineClone 5 repository is hosted at Mesehub. To contribute or report issues, The main goal of **MineClone 5** is to be a clone of Minecraft and to be released as free software. * **Target of development: Minecraft Java Edition latest version** -* MineClone 5 also includes Optifine features supported by the Minetest +* MineClone 5 also includes Optifine features supported by the Minetest engine * In general, Minecraft is aimed to be cloned as good as possible * Cloning the gameplay has highest priority * MineClone 5 will use different assets, but with a similar style From 5bfec00295ba986abc0cfe7fca63565b54acacb4 Mon Sep 17 00:00:00 2001 From: kay27 Date: Sun, 25 Jul 2021 19:42:29 +0400 Subject: [PATCH 3/3] Fix attempt to perform arithmetic on a nil value in mobs.drive() --- mods/ENTITIES/mcl_mobs/api/mount.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mods/ENTITIES/mcl_mobs/api/mount.lua b/mods/ENTITIES/mcl_mobs/api/mount.lua index 0ed54a46e..11b2e5e89 100644 --- a/mods/ENTITIES/mcl_mobs/api/mount.lua +++ b/mods/ENTITIES/mcl_mobs/api/mount.lua @@ -227,8 +227,12 @@ function mobs.drive(entity, moving_anim, stand_anim, can_fly, dtime) end -- mob rotation - entity.object:set_yaw(entity.driver:get_look_horizontal() - entity.rotate) - entity.yaw = entity.driver:get_look_horizontal() - entity.rotate + local rotate = entity.rotate + if rotate then + local yaw = entity.driver:get_look_horizontal() - rotate + entity.yaw = yaw + entity.object:set_yaw(yaw) + end --[[ if can_fly then