Commit Graph

3980 Commits

Author SHA1 Message Date
kay27 f121396b24 Merge pull request 'debiankaios-moss-addition' (#234) from debiankaios-moss-addition into master
Reviewed-on: MineClone5/MineClone5#234
2022-03-05 21:19:39 +00:00
PrairieWind 354ce405b0 added missing blast furnace and smoker textures 2022-03-05 17:22:29 +00:00
PrairieWind 9e00371c6c fixed problem with fuel insertion 2022-03-05 17:07:56 +00:00
debiankaios 82f2cc4a35 Make moss compost-able 2022-03-05 15:30:24 +01:00
kay27 9d7f619a24 Fix smoker textures 2022-03-05 04:24:43 +04:00
kay27 be3549fb8d Fix crash in smoker.lua 2022-03-05 04:16:53 +04:00
kay27 6f66be58b0 Merge master into testing 2022-03-05 00:06:46 +04:00
kay27 7aea22b893 Merge pull request 'Adds Blast Furnaces and Smokers' (#238) from PrairieAstronomer/MineClone5:master into master
Reviewed-on: MineClone5/MineClone5#238
2022-03-04 20:06:22 +00:00
PrairieWind f9d75329e6 updated README 2022-03-04 17:11:16 +00:00
PrairieWind 5dbd695bbc added smoker textures 2022-03-04 16:59:37 +00:00
PrairieWind 832eb497ba added smoker.lua 2022-03-04 16:58:19 +00:00
PrairieWind 6d4a580262 added blast_furnace.lua 2022-03-04 16:53:53 +00:00
PrairieWind f84b2fe223 Add 'mods/ITEMS/mcl_furnaces/furnace.lua' 2022-03-04 16:52:32 +00:00
PrairieWind c4a669a61b added blast furnace textures 2022-03-04 16:50:29 +00:00
PrairieWind 5a74e01e1f updated furnace init.lua 2022-03-04 16:48:58 +00:00
kay27 96bc98e716 Check object in mcl_throwing 2022-03-04 02:59:37 +04:00
debiankaios 789fd7b72c Moss grow now one block up and down 2022-03-03 21:25:29 +01:00
debiankaios 8bd8512d39 You can now place nodes on moss 2022-03-01 10:35:03 +01:00
debiankaios 53c367e718 makes moss able to bonemeal 2022-02-28 16:10:18 +01:00
kay27 6eb154c90b Merge pull request 'Adds Lanterns' (#229) from PrairieAstronomer/MineClone5:master into master
Reviewed-on: MineClone5/MineClone5#229
2022-02-27 22:56:39 +00:00
PrairieWind 084d344fb0 Update 'mods/ITEMS/mcl_lanterns/register.lua' 2022-02-26 03:34:14 +00:00
PrairieWind 6bdfa5b167 Upload files to 'mods/ITEMS/mcl_lanterns/textures' 2022-02-26 03:33:11 +00:00
PrairieWind f24cf897ef Delete 'mods/ITEMS/mcl_blackstone/textures/mcl_blackstone_soul_lantern_inv.png' 2022-02-26 03:31:27 +00:00
PrairieWind af87e0c8b4 Delete 'mods/ITEMS/mcl_blackstone/textures/mcl_blackstone_soul_lantern.png' 2022-02-26 03:31:11 +00:00
PrairieWind 91bb45284e Update 'mods/ITEMS/mcl_blackstone/init.lua' 2022-02-26 03:30:32 +00:00
PrairieWind fcc559e0ed Update 'mods/ITEMS/mcl_blackstone/mod.conf' 2022-02-26 03:29:18 +00:00
PrairieWind 791a3233d5 Delete 'mods/ITEMS/mcl_blackstone/models/mcl_blackstone_lantern_ceiling.obj' 2022-02-26 03:28:34 +00:00
PrairieWind 8122072925 Delete 'mods/ITEMS/mcl_blackstone/models/mcl_blackstone_lantern_floor.obj' 2022-02-26 03:28:16 +00:00
PrairieWind 89e5eb55d0 Update 'mods/ITEMS/mcl_lanterns/register.lua' 2022-02-25 18:24:48 +00:00
PrairieWind 834f7fcb36 Delete 'mods/ITEMS/mcl_lanterns/textures/mcl_lanterns_soul_lantern_inv.png' 2022-02-25 17:40:53 +00:00
PrairieWind 547d1cc350 Delete 'mods/ITEMS/mcl_lanterns/textures/mcl_lanterns_soul_lantern.png' 2022-02-25 17:40:42 +00:00
PrairieWind 43ff5377c3 Update 'mods/ITEMS/mcl_blackstone/init.lua' 2022-02-25 17:39:53 +00:00
PrairieWind 9eacc00df3 Update 'mods/ITEMS/mcl_blackstone/mod.conf' 2022-02-25 17:39:00 +00:00
PrairieWind df1af4c718 Upload files to 'mods/ITEMS/mcl_blackstone/textures' 2022-02-25 17:38:31 +00:00
PrairieWind 2fc27f190d Upload files to 'mods/ITEMS/mcl_blackstone/models' 2022-02-25 17:37:26 +00:00
debiankaios 72c25d6e92 Moss and Mosscarpets are there 2022-02-24 08:33:52 +01:00
kay27 e4273c404a Merge remote-tracking branch 'origin/master' into testing 2022-02-24 06:05:14 +04:00
kay27 4ab521ddc8 #198 Fix a crash, step 28 2022-02-24 06:00:47 +04:00
kay27 cfc0fda314 Finish ruined portals 2022-02-24 03:59:11 +04:00
PrairieAstronomer 1e73d0a19b Delete 'mods/ITEMS/mcl_blackstone/textures/lantern_top.png' 2022-02-22 22:35:23 +00:00
PrairieAstronomer 3741c2cf13 Delete 'mods/ITEMS/mcl_blackstone/textures/lantern_bottom.png' 2022-02-22 22:35:09 +00:00
PrairieAstronomer 05380d838d Delete 'mods/ITEMS/mcl_blackstone/textures/lantern.png' 2022-02-22 22:34:54 +00:00
PrairieAstronomer 1cf22c3c60 removed mcl_blackstone:soul_lantern code, as is now in mcl_lanterns 2022-02-22 22:34:15 +00:00
PrairieAstronomer a3551149b9 Upload files to 'mods/ITEMS/mcl_lanterns/textures' 2022-02-22 22:32:46 +00:00
PrairieAstronomer dc34d32f07 Update 'mods/ITEMS/mcl_lanterns/mod.conf' 2022-02-22 22:30:52 +00:00
PrairieAstronomer e61e06542e Update 'mods/ITEMS/mcl_lanterns/register.lua' 2022-02-22 22:30:00 +00:00
PrairieAstronomer d31d470718 added lantern textures 2022-02-22 18:16:45 +00:00
PrairieAstronomer 25e50c58dd Delete 'mods/ITEMS/mcl_lanterns/mcl_lanterns_chain_inv.png' 2022-02-22 18:15:49 +00:00
PrairieAstronomer 4c23e37f61 Delete 'mods/ITEMS/mcl_lanterns/mcl_lanterns_lantern.png' 2022-02-22 18:15:40 +00:00
PrairieAstronomer d347f3b9d3 Delete 'mods/ITEMS/mcl_lanterns/mcl_lanterns_lantern_inv.png' 2022-02-22 18:15:30 +00:00
PrairieAstronomer 2fdb7a715c Delete 'mods/ITEMS/mcl_lanterns/mcl_lanterns_chain.png' 2022-02-22 18:15:17 +00:00
PrairieAstronomer a20e00ab99 added textures 2022-02-22 18:14:48 +00:00
PrairieAstronomer e26e24ab3c Delete 'mods/ITEMS/mcl_lanterns/textures/lantern.png' 2022-02-22 18:14:11 +00:00
PrairieAstronomer 7f1ee70261 Delete 'mods/ITEMS/mcl_lanterns/textures/lantern_bottom.png' 2022-02-22 18:14:00 +00:00
PrairieAstronomer 95cfbd16e6 Delete 'mods/ITEMS/mcl_lanterns/textures/lantern_top.png' 2022-02-22 18:13:47 +00:00
PrairieAstronomer 6c2e2ae535 Add 'mods/ITEMS/mcl_lanterns/models/mcl_lanterns_lantern_floor.obj' 2022-02-22 18:11:14 +00:00
PrairieAstronomer 39be3e0b6a Add 'mods/ITEMS/mcl_lanterns/models/mcl_lanterns_lantern_ceiling.obj' 2022-02-22 18:10:28 +00:00
PrairieAstronomer 8d89f36b4d Add 'mods/ITEMS/mcl_lanterns/models/mcl_lanterns_chain.obj' 2022-02-22 18:09:07 +00:00
PrairieAstronomer 77f59161d9 Delete 'mods/ITEMS/mcl_lanterns/README.md' 2022-02-22 18:08:09 +00:00
PrairieAstronomer c2a5c30576 Add 'mods/ITEMS/mcl_lanterns/mod.conf' 2022-02-22 18:07:53 +00:00
PrairieAstronomer 3ad0abbf94 Delete 'mods/ITEMS/mcl_lanterns/depends.txt' 2022-02-22 18:07:22 +00:00
PrairieAstronomer 0ed33b5f45 Update 'mods/ITEMS/mcl_lanterns/init.lua' 2022-02-22 18:06:35 +00:00
PrairieAstronomer f23fc7c6a1 Add 'mods/ITEMS/mcl_lanterns/register.lua' 2022-02-22 18:05:22 +00:00
PrairieAstronomer ba32506f12 added texture files to lanterns mod 2022-02-22 00:13:18 +00:00
PrairieAstronomer 8adbe66ca2 Update 'mods/ITEMS/mcl_lanterns/README.md' 2022-02-22 00:12:30 +00:00
PrairieAstronomer 84fc0e7bc3 added mcl_lanterns mod 2022-02-22 00:08:48 +00:00
kay27 9db3b97202 Add crying obsidian 2022-02-22 03:12:45 +04:00
kay27 1a4ec50939 #220 Fix a crash in mcl_comparators 2022-02-21 05:51:00 +04:00
kay27 fd893ed99d Merge pull request 'Flip the carrot on a stick texture horizontally' (#219) from rudzik8/MineClone5:flip_carrot_on_a_stick into master
Reviewed-on: MineClone5/MineClone5#219
2022-02-20 19:02:56 +00:00
kay27 386460e90c Merge remote-tracking branch 'origin/master' into testing 2022-02-20 14:31:16 +04:00
kay27 1a6f4960bf Merge pull request 'Update Russian translation' (#216) from U.N.Owen/MineClone5-translate-ru:master into master
Reviewed-on: MineClone5/MineClone5#216
2022-02-20 09:57:05 +00:00
Sab Pyrope 5af5d05a03 Final typo fix 2022-02-20 15:21:46 +08:00
Sab Pyrope dcf0a05f3c Fix typos 2022-02-20 12:49:25 +08:00
Mikita Wiśniewski a2a95e9f73 Flip the carrot on a stick texture horizontally 2022-02-20 11:48:42 +07:00
Sab Pyrope 5053f0070b Fix typos in translation 2022-02-20 11:39:43 +08:00
kay27 e155db8f9e Fix a crash 2022-02-20 04:39:28 +04:00
kay27 917f04e1f7 Merge remote-tracking branch 'origin/master' into testing 2022-02-20 03:32:13 +04:00
kay27 7c3b0fcfc3 Append irl time to map hash id 2022-02-20 03:31:36 +04:00
3raven b17cecb966 Merge branch 'master' into master 2022-02-19 22:18:59 +00:00
3raven 3254b513ae Mise à jour de 'mods/ITEMS/xpanes/locale/xpanes.fr.tr' 2022-02-19 18:59:04 +00:00
3raven a6d47198f3 Mise à jour de 'mods/ITEMS/mclx_stairs/locale/mclx_stairs.fr.tr'
Cohérence
2022-02-19 18:56:24 +00:00
3raven be10380aed Mise à jour de 'mods/ITEMS/mclx_fences/locale/mclx_fences.fr.tr'
cohérence
2022-02-19 18:54:08 +00:00
3raven d4e017a292 Mise à jour de 'mods/ITEMS/mclx_core/locale/mclx_core.fr.tr' 2022-02-19 18:52:53 +00:00
3raven 87a800fb67 Mise à jour de 'mods/ITEMS/mcl_wool/locale/mcl_wool.fr.tr'
correction
2022-02-19 18:51:41 +00:00
3raven 5344848526 Mise à jour de 'mods/ITEMS/mcl_walls/locale/mcl_walls.fr.tr'
GRANITE with an e
2022-02-19 18:50:32 +00:00
3raven dcf383c327 Mise à jour de 'mods/ITEMS/mcl_tools/locale/mcl_tools.fr.tr'
correction
2022-02-19 18:47:50 +00:00
3raven e99ecf2b62 Mise à jour de 'mods/ITEMS/mcl_tnt/locale/mcl_tnt.fr.tr'
correction
2022-02-19 18:42:03 +00:00
3raven fb0b495690 Mise à jour de 'mods/ITEMS/mcl_throwing/locale/mcl_throwing.fr.tr'
correction
2022-02-19 18:39:14 +00:00
3raven 60cecd577c Mise à jour de 'mods/ITEMS/mcl_stairs/locale/mcl_stairs.fr.tr'
https://fr.wikipedia.org/wiki/Granite with an e in french
2022-02-19 18:34:16 +00:00
3raven 38acffbd4a Mise à jour de 'mods/ITEMS/mcl_sponges/locale/mcl_sponges.fr.tr'
corrections
2022-02-19 18:18:29 +00:00
3raven d690cd7f10 Mise à jour de 'mods/ITEMS/mcl_signs/locale/mcl_signs.fr.tr'
reformulation
2022-02-19 18:14:55 +00:00
3raven 87f9ef7bc9 mcl_shields.fr.tr
french translation
2022-02-19 18:12:13 +00:00
3raven 6aae704e47 Mise à jour de 'mods/ITEMS/mcl_potions/locale/mcl_potions.fr.tr'
corrections, cohérence
2022-02-19 18:04:04 +00:00
3raven ac12357595 Mise à jour de 'mods/ITEMS/mcl_portals/locale/mcl_portals.fr.tr'
Correction
2022-02-19 17:55:25 +00:00
3raven 9d10b38b3a Mise à jour de 'mods/ITEMS/mcl_ocean/locale/mcl_ocean.fr.tr'
Corrections
2022-02-19 17:46:09 +00:00
3raven 1fb5874a69 Mise à jour de 'mods/ITEMS/mcl_nether/locale/mcl_nether.fr.tr'
Corrections
2022-02-19 17:40:59 +00:00
3raven e783d77bee Mise à jour de 'mods/ITEMS/mcl_mushrooms/locale/mcl_mushrooms.fr.tr'
Corrections
2022-02-19 17:32:52 +00:00
3raven 4cf52aada6 mcl_mushroom.fr.tr
Translation
2022-02-19 17:27:23 +00:00
kabou 948d9ab71a Merge branch 'master' into composters 2022-02-19 17:18:33 +00:00
3raven 75ef4c065f Mise à jour de 'mods/ITEMS/mcl_mobspawners/locale/mcl_mobspawners.fr.tr'
Correction
2022-02-19 17:07:57 +00:00
3raven e92ffdce84 Mise à jour de 'mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr'
Correction
2022-02-19 17:05:53 +00:00
3raven 1491cf97e9 Mise à jour de 'mods/ITEMS/mcl_hoppers/locale/mcl_hoppers.fr.tr'
Corrections
2022-02-19 16:49:44 +00:00
3raven deaf383465 Mise à jour de 'mods/ITEMS/mcl_heads/locale/mcl_heads.fr.tr'
Corrections
2022-02-19 16:39:28 +00:00
3raven e7120c85ca Mise à jour de 'mods/ITEMS/mcl_furnaces/locale/mcl_furnaces.fr.tr'
Corrections
2022-02-19 16:35:21 +00:00
3raven 8260b42698 Mise à jour de 'mods/ITEMS/mcl_flowers/locale/mcl_flowers.fr.tr'
Corrections
2022-02-19 16:32:05 +00:00
3raven ac9aaf927e Mise à jour de 'mods/ITEMS/mcl_flowerpots/locale/mcl_flowerpots.fr.tr'
Coherence
2022-02-19 16:24:47 +00:00
kabou 0e48a29787 Optimize texture files.
* Texture files were optimized with 'optipng  -o7 -zm9 -strip all' .
2022-02-19 16:57:22 +01:00
Sab Pyrope 4d95fc6253 rework 2022-02-19 23:23:40 +08:00
Sab Pyrope 5076f730cb Rework 2022-02-19 23:20:17 +08:00
kabou 4e5cc0cb2b Change custom node attribute name.
* Rename _compost_level to _mcl_compost_level
2022-02-19 14:55:25 +01:00
Sab Pyrope 3a54254077 Update Russian translation 2022-02-19 21:16:43 +08:00
Sab Pyrope e817c1dbc6 Update Russian and other translations 2022-02-19 21:14:51 +08:00
kay27 b89cd66f5d Fix maps 2022-02-19 06:54:19 +04:00
kay27 17c30de74a Fix maps in a very lame way 2022-02-19 06:52:51 +04:00
3raven 88c15f967e Mise à jour de 'mods/ITEMS/mcl_fences/locale/mcl_fences.fr.tr' 2022-02-19 01:47:32 +00:00
3raven c9f84224f3 Mise à jour de 'mods/ITEMS/mcl_fences/locale/mcl_fences.fr.tr' 2022-02-19 01:46:59 +00:00
3raven df080ad949 Mise à jour de 'mods/ITEMS/mcl_fire/locale/mcl_fire.fr.tr' 2022-02-19 01:45:11 +00:00
3raven 82f63f01b6 Mise à jour de 'mods/ITEMS/mcl_farming/locale/mcl_farming.fr.tr' 2022-02-19 01:35:35 +00:00
3raven 07b7a9ea90 Mise à jour de 'mods/ITEMS/mcl_end/locale/mcl_end.fr.tr'
Corrections
2022-02-19 01:15:46 +00:00
3raven 7fe70035e2 Mise à jour de 'mods/ITEMS/mcl_enchanting/locale/mcl_enchanting.fr.tr'
Correction
2022-02-19 01:07:56 +00:00
3raven 254c445538 Mise à jour de 'mods/ITEMS/mcl_dye/locale/mcl_dye.fr.tr'
Corrections, cohérence
2022-02-19 01:01:20 +00:00
3raven 7d6097fd06 Mise à jour de 'mods/ITEMS/mcl_doors/locale/mcl_doors.fr.tr'
Corrections
2022-02-19 00:57:38 +00:00
3raven f74726a021 mcl_deepslate.fr.tr
Translation
2022-02-19 00:53:54 +00:00
3raven 70880b832a Mise à jour de 'mods/ITEMS/mcl_core/locale/mcl_core.fr.tr'
Corrections, reformulations
2022-02-19 00:14:01 +00:00
3raven c2bc51f025 mcl_copper.fr.tr
Translation
2022-02-18 23:40:41 +00:00
3raven 5a43131557 mcl_composters.fr.tr
Translation
2022-02-18 23:21:54 +00:00
3raven 952fd163b7 Mise à jour de 'mods/ITEMS/mcl_colorblocks/locale/mcl_colorblocks.fr.tr'
Corrections
2022-02-18 23:11:04 +00:00
3raven 32fe30e571 Mise à jour de 'mods/ITEMS/mcl_clock/locale/mcl_clock.fr.tr' 2022-02-18 23:05:40 +00:00
3raven cd69ace83a Mise à jour de 'mods/ITEMS/mcl_banners/locale/mcl_banners.fr.tr' 2022-02-18 23:03:09 +00:00
3raven 0a10470e03 Mise à jour de 'mods/ITEMS/mcl_chests/locale/mcl_chests.fr.tr'
Corrections
2022-02-18 23:01:41 +00:00
3raven b8a8c79342 Mise à jour de 'mods/ITEMS/mcl_brewing/locale/mcl_brewing.fr.tr'
Corrections
2022-02-18 22:40:30 +00:00
3raven 7600c31512 Mise à jour de 'mods/ITEMS/mcl_bows/locale/mcl_bows.fr.tr'
Corrections
2022-02-18 22:37:21 +00:00
kay27 9f395390e4 Fix Nether Wart growth final hopefully 2022-02-19 02:36:02 +04:00
3raven 8ba0afbaed Mise à jour de 'mods/ITEMS/mcl_books/locale/mcl_books.fr.tr'
Corrections
2022-02-18 22:33:58 +00:00
3raven 222d301286 mcl_blackstone.fr.tr
Traduction
2022-02-18 22:29:38 +00:00
3raven eb5b513c18 Mise à jour de 'mods/ITEMS/mcl_banners/locale/mcl_banners.fr.tr'
Corrections
2022-02-18 22:01:54 +00:00
3raven 9ecfef6b9b Mise à jour de 'mods/ITEMS/mcl_armor_stand/locale/mcl_armor_stand.fr.tr'
Corrections
2022-02-18 21:57:36 +00:00
3raven 88ff49ea3a Mise à jour de 'mods/ITEMS/mcl_anvils/locale/mcl_anvils.fr.tr'
Corrections
2022-02-18 21:53:08 +00:00
kay27 460fd7fe07 Fix nether wart growrh again 2022-02-19 01:52:10 +04:00
3raven 5dae184c48 mcl_amethyst.fr.tr
Translation
2022-02-18 21:43:51 +00:00
kay27 be76f372f3 Merge remote-tracking branch 'origin/master' into testing 2022-02-19 00:14:44 +04:00
kabou b8af8cacd5 Add player object check.
* Add one more check if player object is an actual player.
2022-02-18 16:54:07 +01:00
Mikita Wiśniewski 69df4f261d Replace old weird sweet berry textures with the new ones by Nova_Wostra 2022-02-18 20:58:25 +07:00
kabou f6ec8e94d2 Add help alias
* Add help alias for the ready type composter
2022-02-17 21:53:08 +01:00
kabou 3494fa80b5 Comment fixes.
* Improve comments, some typo fixes.
2022-02-17 21:42:33 +01:00
kabou b138357b11 Update mod description and fix comment.
* Make mod description more descriptive.
* Minor comment tweak.
2022-02-17 15:39:10 +01:00
kabou 77b020e1ec Add missing melon block.
* Add melon block to the compostabiles list.
2022-02-17 14:37:51 +01:00
kabou 4cb3c6d51b Add player object check.
* Handle the case where a mob somehow "clicks" on a composter and we get
  an invalid player object passed.
2022-02-17 14:24:55 +01:00
kabou 9ef9530c04 Update mod deps
* Add dependency on mcl_dye for bone meal particle spawner.
2022-02-17 14:03:25 +01:00
kabou 72aba1d8bb Typo fix.
* it's a spruceSapling (thanks NO11)
2022-02-17 13:54:08 +01:00