1
0
Fork 0
Commit Graph

5040 Commits

Author SHA1 Message Date
PrairieWind d3095fea57 Update ignition, smothering, and campfire inventory drops
Bonus fix for grass path creation sound traveling across the entire server
2023-09-04 22:05:38 +00:00
DinoNuggies4665 177196a8d2 modified: mods/ITEMS/mcl_campfires/api.lua
modified:   mods/ITEMS/mcl_fishing/init.lua
	modified:   mods/ITEMS/mcl_mobitems/init.lua
2023-09-04 22:05:38 +00:00
DinoNuggies4665 13d4841097 A couple of fixes 2023-09-04 22:05:38 +00:00
DinoNuggies4665 0b7cec419a Added visible items cooking on the fire 2023-09-04 22:05:38 +00:00
DinoNuggies4665 cef6c72a71 modified: mods/ITEMS/mcl_campfires/mod.conf 2023-09-04 22:05:38 +00:00
DinoNuggies4665 aca82fcafc modified: mods/ITEMS/mcl_campfires/api.lua
modified:   mods/ITEMS/mcl_mobitems/init.lua
2023-09-04 22:05:38 +00:00
DinoNuggies4665 a7fcd62999 Added visible items cooking on the fire 2023-09-04 22:05:38 +00:00
PrairieWind d489c954f5 Campfires make big smoke
Smells like carcenogens, yum
2023-09-04 22:05:38 +00:00
PrairieWind 8b0097df71 Make campfires cook items 2023-09-04 22:05:38 +00:00
chmodsayshello 408c7f71da Merge pull request 'Update Russian translation' (#3896) from Nanashi_Mumei/MineClone2:master into master
Reviewed-on: MineClone2/MineClone2#3896
Reviewed-by: rudzik8
2023-09-02 08:25:43 +00:00
Sab Pyrope 8b7a71f93e Update Russian translation. Fix 1. 2023-09-02 15:51:49 +08:00
ancientmarinerdev 4853018bb0 Merge pull request 'Increase copper needed for blocks from 4 to 9' (#3887) from basxto/MineClonXX:copper into master
Reviewed-on: MineClone2/MineClone2#3887
2023-09-01 12:20:28 +00:00
SmokeyDope b911f99d23 fix barrel sound code for proper max hear distance 2023-08-31 22:55:21 +00:00
Van 7b764adbc0 Banners color editing (#3868)
### Changing banner colors
Reason: I think the current colors of the banners do not match the palette of the surrounding world.
Solution: Muting Banner Tones

### Testing
Check out the new colors on 12 color banners.

### Attachments
Changed banner colors/Current banner appearance

UPDATE: Adjusted colors, see the third attachment

UPDATE: Changed the color of the white flag. Fixed a bug with different colors of patterns and banners, increased the contrast of folds. The last four attachments display all.
Reviewed-on: MineClone2/MineClone2#3868
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
Co-authored-by: Van <vanicgame@yandex.ru>
Co-committed-by: Van <vanicgame@yandex.ru>
2023-08-31 22:27:08 +00:00
chmodsayshello 1502757732 Merge pull request 'Replace spaces in itemstrings with underscore' (#3895) from basxto/MineClonXX:fixspace into master
Reviewed-on: MineClone2/MineClone2#3895
Reviewed-by: AFCMS <afcm.contact@gmail.com>
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-08-31 17:08:18 +00:00
chmodsayshello 49bd28e109 add/remove comments 2023-08-31 18:16:34 +02:00
chmodsayshello 6c107ce990 fix for enchanted items 2023-08-31 17:59:46 +02:00
Sab Pyrope 5b4a79a26d Update russian translation 2023-08-31 14:16:42 +08:00
chmodsayshello fb74689f3d resolve merge conflicts 2023-08-28 16:47:31 +02:00
chmodsayshello da024bb4b8 move mcl_armor_trims to mcl_armor 2023-08-28 15:09:48 +02:00
ancientmarinerdev 3c266f5cfd Merge pull request 'Enable enchanting on sheers & allow enchanted shears to shear.' (#3884) from Codiac/MineClone2:shears_fix into master
Reviewed-on: MineClone2/MineClone2#3884
Reviewed-by: AFCMS <afcm.contact@gmail.com>
2023-08-27 23:42:53 +00:00
chmodsayshello 2f8bb9726b meta based: proof of concept 2023-08-27 21:44:43 +02:00
Sebastian Riedel 28d77a3e5b Replace spaces in itemstrings with underscore 2023-08-20 03:19:17 +02:00
AFCMS 1b5b2e4dc7
Use new vectors in several places 2023-08-19 18:27:00 +02:00
AFCMS 560aead57f
Use `table.indexof` in `mcl_anvils` 2023-08-19 18:18:27 +02:00
AFCMS 3fe3153a40
Remove duplicated creative digging code 2023-08-19 18:01:32 +02:00
AFCMS f7c251e7f2
Fix `mcl_grindstone` auto formating 2023-08-19 18:01:31 +02:00
AFCMS 1bdbdc365d
Fix `mcl_enchanting` auto formating 2023-08-19 18:01:31 +02:00
AFCMS a77930d4a1
Fix `mcl_chests` auto formating 2023-08-19 18:01:31 +02:00
AFCMS bb3771c0d2
Fix formating in `mcl_anvils` 2023-08-19 18:01:31 +02:00
AFCMS 40bc219a86
Fix `mcl_books` formating? 2023-08-19 18:01:31 +02:00
AFCMS 054dc22432
Use new vectors in `mcl_chests` 2023-08-19 18:01:31 +02:00
AFCMS 06e2022c6d
Fix `mcl_enchanting` formating 2023-08-19 18:01:30 +02:00
AFCMS 2cb9eca8e1
Use new vectors in `mcl_blast_furnace` 2023-08-19 18:01:30 +02:00
AFCMS cd6dd4d851
Fix merge conflict (huge chests) 2023-08-19 18:01:30 +02:00
AFCMS 653f82198e
Apply MysticTempest fixes to enchanting table 2023-08-19 18:01:29 +02:00
AFCMS 7cf91c79cb
Smithing Table 2023-08-19 18:01:29 +02:00
AFCMS 6a2ad4e618
Materialize the fact that bookshelves only store books 2023-08-19 18:01:29 +02:00
AFCMS ecb4c82600
Anvil Formspec
- anvil formspec
- hammer icon
- use new vectors
- add some type annotations
- optimize textures (some of them by 95%)
2023-08-19 18:01:28 +02:00
AFCMS 7c15fe6ac9
Furnaces formspec redo 2023-08-19 18:01:28 +02:00
AFCMS f6804600ba
Grindstone menu 2023-08-19 18:01:28 +02:00
AFCMS bf57cf3aa3
Barrel formspec 2023-08-19 18:01:28 +02:00
AFCMS 0da1822d26
Code style fixes in mcl_chests 2023-08-19 18:01:27 +02:00
AFCMS 0ae76776b1
Bookshelf menu redo 2023-08-19 18:01:27 +02:00
AFCMS e5ee0c4afc
Crafting table formspec redo 2023-08-19 18:01:27 +02:00
AFCMS 842363464d
Enchanting table formspec redo 2023-08-19 18:01:27 +02:00
AFCMS 37176976b6
Dropper + Dispenser inventory 2023-08-19 18:01:27 +02:00
AFCMS 1065eb4d8c
Hooper formspec 2023-08-19 18:01:26 +02:00
AFCMS e093c69328
Remove the label size thing (too breaking change) 2023-08-19 18:01:26 +02:00
AFCMS 54b119cffa
some things 2023-08-19 18:01:25 +02:00
AFCMS 558df5e4bd
fix all chest formspecs 2023-08-19 18:01:25 +02:00
AFCMS cf01c0630c
chest + shulkerbox formspec 2023-08-19 18:01:25 +02:00
AFCMS f20fbfb95a
ender chest formspec v4 2023-08-19 18:01:25 +02:00
cora dd96af15c4 Shears are not enchantable on enchanting table 2023-08-15 13:52:33 +10:00
Sebastian Riedel 11d275a471 Increase copper needed for blocks from 4 to 9 2023-08-14 12:57:36 +02:00
codiac 8c64fdfa5d Enable enchanting on sheers & allow enchanted shears to shear. 2023-08-13 14:02:15 +10:00
Wbjitscool 86b5648442 updates the warped, crimson and mangrove trapdoor side textures (#3844)
updates the side textures for the warped, crimson and mangrove trapdoors.

Reviewed-on: MineClone2/MineClone2#3844
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: Wbjitscool <wilsonjonathan131@gmail.com>
Co-committed-by: Wbjitscool <wilsonjonathan131@gmail.com>
2023-07-22 20:50:07 +00:00
ADLON dd3969ff56 Russian translation (#3842)
Add in Russian translations.

Reviewed-on: MineClone2/MineClone2#3842
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: ADLON <hgkacin303@proinko.com>
Co-committed-by: ADLON <hgkacin303@proinko.com>
2023-07-22 20:17:33 +00:00
ancientmarinerdev 80ac4aa930 Merge pull request 'Fix syntax errors in Brazilian Portuguese' (#3824) from isaacdennis/MineClone2:fix-pt-br into master
Reviewed-on: MineClone2/MineClone2#3824
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-07-22 20:05:21 +00:00
ancientmarinerdev 13fc47751d Merge pull request 'Multishot angular spread is constant, no matter the player's orientation' (#3833) from seventeenthShulker/MineClone2:relative_multishot into master
Reviewed-on: MineClone2/MineClone2#3833
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-07-22 20:01:31 +00:00
ancientmarinerdev 2ff98f0d27 Merge pull request 'Stop consuming bamboo item when placement is invalid' (#3829) from seventeenthShulker/MineClone2:bamboo_disappearing into master
Reviewed-on: MineClone2/MineClone2#3829
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-07-22 19:31:08 +00:00
seventeenthShulker 4365f4df77 Remove whitespace 2023-07-06 19:10:00 +02:00
seventeenthShulker 99af25fba3 Side arrow directions are relative to player orientation 2023-07-06 19:08:52 +02:00
seventeenthShulker bd95528e73 Stop consuming bamboo item when placement is invalid 2023-06-30 17:53:03 +02:00
PrairieWind 3255b7f754 Cherry saplings can be potted.
Change by 3raven
2023-06-29 18:38:22 -06:00
Isaac Dennis 75a31a2106
Fix malformed line and missing part of translation 2023-06-27 21:44:43 -03:00
Kristian d4e348a4bd TOM bøger 2023-06-27 21:09:03 +00:00
Kristian 590cbc0c3c Banners done 2023-06-27 21:09:03 +00:00
Kristian 6d767b7d11 Indtil banner 2023-06-27 21:09:03 +00:00
Kristian 7ba0773769 Skift til items. TOM ambolt. 2023-06-27 21:09:03 +00:00
José Muñoz 09732acf77 Improve the translation 2023-06-27 20:39:27 +00:00
José Muñoz 008dd95f1f Add spanish translation 2023-06-27 20:39:27 +00:00
José Muñoz f6fb1d1121 Fix a typo 2023-06-27 20:39:27 +00:00
José Muñoz c61df75370 Add spanish translations 2023-06-27 20:39:27 +00:00
cora d0e981e4db Fix gilded blackstone fortune dupe 2023-06-26 22:08:18 -06:00
ancientmarinerdev 03341ade2e Added underscore in to cherry sign registration to ensure consistent with other signs 2023-06-25 17:49:52 +01:00
ancientmarinerdev 3c4fb9abb2 Ensure dark oak has separate tt message 2023-06-25 16:37:02 +00:00
ancientmarinerdev 852c2c5710 Remove message about missing name is deprecated in mod conf files 2023-06-25 16:37:02 +00:00
ancientmarinerdev 1dfbd612be Remove warning for use of global variable and set default tt_help message 2023-06-25 16:37:02 +00:00
PrairieWind 17371ad60b Cherry blossom changes as requested 2023-06-25 16:37:02 +00:00
PrairieWind 0902e137e3 Uncover wood api functions and use them in cherry and mangrove wood 2023-06-25 16:37:02 +00:00
PrairieWind 67078ba3b1 Fix most of the feedback issues in cherry blossoms 2023-06-25 16:37:02 +00:00
PrairieWind da71e7b521 Add cherry boat 2023-06-25 16:37:02 +00:00
PrairieWind 960f9adda8 Add Remaining cherry nodes, textures, and cherry particles 2023-06-25 16:37:02 +00:00
PrairieWind c5c35ca786 Add Cherry Blossom Trees and Growth 2023-06-25 16:37:02 +00:00
PrairieWind bba440b617 Move textures out of the mcl_cherry_blossom mod 2023-06-25 16:37:02 +00:00
PrairieWind 101cde2a94 First cherry blossom commit 2023-06-25 16:37:02 +00:00
ancientmarinerdev 7d51519f4d Fix wool farm crash 2023-06-21 20:47:54 +00:00
ancientmarinerdev baf6ae65e7 Fix tab character in filename 2023-06-21 15:03:39 +01:00
chmodsayshello 9d1840f4ca fix crash (no longer allow blacklisted items) 2023-06-21 12:15:41 +02:00
chmodsayshello 460ef23b50 make upgrade_trimmed global 2023-06-21 11:49:21 +02:00
chmodsayshello 1e16647fe9 various codestyle fixes 2023-06-21 11:21:39 +02:00
chmodsayshello 16415ae577 bring back old global function 2023-06-21 10:57:50 +02:00
chmodsayshello 2665980007 add ':' to modname once 2023-06-21 10:53:41 +02:00
chmodsayshello 75d6509c3e prevent ALL furnaces from being moved 2023-06-20 00:02:03 +01:00
Temak f7f8a72d08 Update russian translation (#3519)
Update russian translation by Temak

Reviewed-on: MineClone2/MineClone2#3519
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: Temak <artemkotlubai@yandex.ru>
Co-committed-by: Temak <artemkotlubai@yandex.ru>
2023-06-19 21:54:51 +00:00
Niterux 766c9efe33 Add more fishing sounds! (#3800)
Go fishing with the fishing rod, and enjoy the sounds

Co-authored-by: Niterux <parkerdec@gmail.com>
Reviewed-on: MineClone2/MineClone2#3800
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: Niterux <parkerp1ggypc@gmail.com>
Co-committed-by: Niterux <parkerp1ggypc@gmail.com>
2023-06-19 11:49:58 +00:00
ancientmarinerdev 52fba55910 Merge pull request 'Fix texture modifiers relying on undocumented behavior' (#3761) from appgurueu/MineClone2:fix-textures into master
Reviewed-on: MineClone2/MineClone2#3761
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-06-18 17:56:58 +00:00
ancientmarinerdev da19aceb06 Fix double slab default description warning. Should use default unless neccessary. Why warn? 2023-06-18 16:06:35 +00:00
seventeenthShulker 758d38894d Prevent slime blocks from 'connecting' to honey blocks when pushing/pulling, like in Minecraft. 2023-06-17 16:42:06 +02:00