Commit Graph

4925 Commits

Author SHA1 Message Date
chmodsayshello 99918c192c Merge pull request 'add the ability to chat whilst being in bed' (#3634) from bedchat into master
Reviewed-on: MineClone2/MineClone2#3634
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-11 19:00:48 +00:00
PrairieWind f8d338d731 Add position to shield sound 2023-04-11 17:16:57 +00:00
PrairieWind 5165730da8 Make shield block sounds not play across infinite distance 2023-04-11 17:16:57 +00:00
chmodsayshello 0719d6038c add missing '=' to the translation template 2023-04-09 19:53:28 +02:00
chmodsayshello bf9989beb9 add default message button 2023-04-09 19:51:55 +02:00
chmodsayshello 62c014363d 'fix' multiline comment 2023-04-09 18:50:34 +02:00
chmodsayshello 75595115a0 move rate checks to seperate function 2023-04-09 18:45:23 +02:00
chmodsayshello d9ac803f5b update translations 2023-04-09 18:37:02 +02:00
chmodsayshello 899d619624 fix translator syntax 2023-04-09 18:35:03 +02:00
chmodsayshello 145be4c830 remove debug logging 2023-04-09 18:32:52 +02:00
chmodsayshello a55cbaadd6 take 'chat_message_limit_per_10sec' into account 2023-04-09 18:32:15 +02:00
ancientmarinerdev 7b748efa64 Merge branch 'master' into pplates 2023-04-08 23:11:16 +00:00
chmodsayshello 2366969e00 update german translation 2023-04-07 12:00:36 +02:00
chmodsayshello fca23ba47f update traslation template 2023-04-07 11:59:07 +02:00
chmodsayshello 4b1cc017a9 fix syntax 2023-04-07 11:58:27 +02:00
chmodsayshello 786aaf7a6d check for shout priv 2023-04-07 11:58:03 +02:00
ancientmarinerdev 7fe1be2c18 Add error handling to sunlight checking to prevent crashing and improve diagnosis. 2023-04-06 13:35:38 +00:00
chmodsayshello 645e20afa4 translation updates 2023-04-05 15:45:48 +02:00
chmodsayshello a026bbd3c4 minor bed changes 2023-04-05 15:45:16 +02:00
chmodsayshello 9c8463d2e3 add basic bed-chat 2023-04-05 14:43:07 +02:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 93bc5bb5f8 Slow down the pressure plate timer 2023-04-04 07:38:50 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 87bf3aed59 Don't drop banners in creative mode 2023-04-02 21:58:34 +00:00
ancientmarinerdev 8edffeb40d Map gen kelp should init age also 2023-04-02 20:04:32 +00:00
ancientmarinerdev 80f038da4a Do not run kelp lbm every time 2023-04-02 20:04:32 +00:00
PrairieWind 088922dc33 Make sure banner drops, even if banner entity doesn't exist 2023-04-02 11:22:26 -05:00
PrairieWind a98f79763b Remove unused digger variable that I forgot 2023-04-02 11:22:26 -05:00
PrairieWind 9c83755f53 Make banners drop when support node is dug and when banner node is dug 2023-04-02 11:22:26 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 771044236f Don't drop beds in creative 2023-04-02 11:06:37 -05:00
PrairieWind f284b1ca0e Fix minor issue with mcl_stairs.register_stair function 2023-03-30 02:03:08 +00:00
PrairieWind 2bd36b5d66 Make lecterns require wood slabs for crafting
Otherwise you can use stone slabs to craft lecterns, which doesn't make sense
2023-03-30 02:03:08 +00:00
PrairieWind 8a129fa00c Add slab and stair groups to crimson and warped slabs and stairs 2023-03-29 09:47:29 -06:00
Wbjitscool bfa5662421 Update 'mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/template.txt' 2023-03-27 00:24:40 +00:00
Wbjitscool 87ca144c4e Update 'mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt' 2023-03-27 00:23:53 +00:00
Wbjitscool a10235f330 Update 'mods/ITEMS/REDSTONE/mesecons_button/init.lua'
added in a Polished Blackstone Button
2023-03-27 00:07:48 +00:00
Wbjitscool e3978c4d22 Update 'mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt'
updated template.txt for buttons
2023-03-27 00:05:52 +00:00
Wbjitscool c0fa2c38bd Update 'mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua'
added polished blackstone pressure plate
2023-03-27 00:02:29 +00:00
Wbjitscool 049a4a11f4 Update 'mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/template.txt'
updated template.txt
2023-03-27 00:00:09 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 692758bd6d Remove deprecated usages of image property in tile defs 2023-03-26 22:56:33 +00:00
ancientmarinerdev a806833e4a Fix crash stripping unregistered block 2023-03-25 02:05:30 +00:00
ancientmarinerdev 6c8113dec8 Fix crash when cannot get wear for tool 2023-03-25 01:55:52 +00:00
ancientmarinerdev b72dbf17a6 Crash for dropper failing as potentially cannot get pos. 2023-03-25 01:55:52 +00:00
SmokeyDope 47b6e54dad Add comments explaining new lantern functions 2023-03-23 22:18:04 +00:00
SmokeyDope 257e5f993b Add lantern functions for adding nodes to allowed placement list 2023-03-23 22:18:04 +00:00
ancientmarinerdev f319a8d903 Fixing that annoying chest open 2023-03-23 01:29:05 +00:00
ancientmarinerdev a513547958 Remove title 2023-03-21 22:20:26 +00:00
ancientmarinerdev 1c0387b898 Fix warnings and global vars 2023-03-21 22:20:26 +00:00
SmokeyDope 3f80cc8f26 Adjust beetroot hitbox heights 2023-03-18 21:59:46 +00:00
SmokeyDope 68a44d7824 one more carrot adjust 2023-03-18 21:59:46 +00:00
SmokeyDope ced3b4dff1 Adjust carrot hitbox heights 2023-03-18 21:59:46 +00:00
SmokeyDope 44711369d9 Further adjust potato hitbox heights 2023-03-18 21:59:46 +00:00
SmokeyDope 3839250b38 Fix potatoes stage 2 hitbox 2023-03-18 21:59:46 +00:00
ancientmarinerdev 002a63585f Tweak volume and change reference to missing global variable 2023-03-18 18:30:03 +00:00
SmokeyDope 811f8ac516 One more indentation fix, sorry for the extra commit 2023-03-18 18:30:03 +00:00
SmokeyDope 89f2c06af2 Fix accidental extra spaces 2023-03-18 18:30:03 +00:00
SmokeyDope 20f8e18098 Add sounds when using composter 2023-03-18 18:30:03 +00:00
ancientmarinerdev a3f23d0b35 Remove unneeded logging 2023-03-17 20:36:53 +00:00
ancientmarinerdev 2c7039fdda Clean up code 2023-03-17 20:36:53 +00:00
ancientmarinerdev c6db032674 Rework sculk to be off the xp_step and triggered by events 2023-03-17 20:36:53 +00:00
ancientmarinerdev 3063cc97f7 Merge pull request 'Fix syntax errors in French' (#3542) from syl/MineClone2:syntaxerrorsfr into master
Reviewed-on: MineClone2/MineClone2#3542
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-15 15:25:02 +00:00
ancientmarinerdev db53e41ebd Merge pull request 'Make dye descriptions more consistent' (#3532) from grorp/MineClone2:owl into master
Reviewed-on: MineClone2/MineClone2#3532
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-14 14:38:39 +00:00
syl 1d981876d9 Fix syntax errors in French 2023-03-14 11:55:07 +01:00
ancientmarinerdev 994f720385 Merge pull request 'Improve French translation' (#3531) from syl/MineClone2:master into master
Reviewed-on: MineClone2/MineClone2#3531
Reviewed-by: AFCMS <afcm.contact@gmail.com>
2023-03-12 20:55:36 +00:00
grorp a766a6ac85 Fix a mistake in the German mcl_dye translation 2023-03-12 11:41:45 +00:00
grorp 2b0c5549f4 Update translations (9/9) 2023-03-12 11:35:56 +00:00
grorp 79996f143e Update translations (8/9) 2023-03-12 11:35:31 +00:00
grorp 166f15f5c6 Update translations (7/9) 2023-03-12 11:34:51 +00:00
grorp c706d44d55 Update translations (6/9) 2023-03-12 11:34:14 +00:00
grorp feca77c1d7 Update translations (5/9) 2023-03-12 11:33:49 +00:00
grorp 9463d12a35 Update translations (4/9) 2023-03-12 11:33:25 +00:00
grorp fa07fab325 Update translations (3/9) 2023-03-12 11:32:59 +00:00
grorp df16065617 Update translations (2/9) 2023-03-12 11:32:32 +00:00
grorp 735904ce61 Update translations (1/9) 2023-03-12 11:32:05 +00:00
grorp 49a5e28398 Make dye descriptions more consistent
The descriptions of all the dyes now end with the word "Dye". Also, they happen to match the descriptions in Minecraft now, but that wasn't my intention.
2023-03-11 08:18:14 +00:00
FossFanatic d8d44fce0f Remove source of warnings for leaves
This commit changes some code so the debug log no longer gets flooded with warnings about leaves and palettes.
2023-03-11 00:30:22 +00:00
syl 96b2f6a01d Improve French translation 2023-03-10 22:48:46 +01:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 3c9b3497bb Fix waxing duplication of shulker box 2023-03-09 15:16:11 -06:00
FossFanatic 6304502173 Rename some things
This commit renames `tnt_griefing` to `explosions_griefing` to better reflect what this setting now does.
2023-03-09 12:52:22 -06:00
ancientmarinerdev 67ddad987d Fix grass not growing issue 2023-03-06 17:45:38 +00:00
FossFanatic 261b5dda98 Remove excessive code
This removes a piece of excessive code, which I accidentally left behind.
2023-03-05 12:45:45 +00:00
FossFanatic 260a76e5ee Add grass palette nodes in a special group & more
This commit adds any nodes which make use of a grass palette to a `grass_palette` group, to avoid having to create a list of said nodes every time.

I also added one line of code to potted ferns, in preparation for when I get to adding biome coloured potted ferns, which currently use a fixed colour instead of the biome's colour.
2023-03-05 12:45:44 +00:00
FossFanatic b4d41d1284 Prepare some things for future additions
Adds a couple of lines of code in preparation for when I try to add biome coloured potted ferns, which currently use a fixed colour instead of the biome's colour.
2023-03-05 12:45:44 +00:00
FossFanatic e82ff4781a Add grass palette nodes in a special group
This commit adds any nodes which make use of a grass palette to a `grass_palette` group, to avoid having to create a list of said nodes every time.
2023-03-05 12:45:44 +00:00
SmokeyDope 551b0c31bb Change glowing item frame inventory image to "mcl_itemframes_glow_item_frame.png"
"mcl_itemframes_glow_item_frame_border.png" "mcl_itemframes_glow_item_frame_item.png" and "mcl_itemframes_glow_item_frame" are all the same image, can save a few kilobytes by editing the glowing item frame code to just use one and removing the other two of them.
2023-03-04 18:13:24 +00:00
FossFanatic dbbac7962d Fix the seagrass param2 and more 2023-03-04 15:42:37 +00:00
FossFanatic c0f52ad344 Fix maps to display coloured foliage and water 2023-03-04 13:47:51 +00:00
FossFanatic 8a408a5c7f Remove old .json file 2023-03-04 13:47:51 +00:00
PrairieWind 2f10a8767b Beehives only go into inventory in creative when no beehive exists in the inventory 2023-03-03 23:05:18 +00:00
PrairieWind c71aec6f9d Add beehives and bee nests to inventory in creative 2023-03-03 23:05:18 +00:00
PrairieWind 493839cf11 Disable beehive/nest drops in creative 2023-03-03 23:05:18 +00:00
anarquimico c37aad26c3 Make hoppers push items to minecarts 2023-03-03 16:13:49 -06:00
anarquimico 6bdc0f032f Fixed for river_water_logged_roots 2023-03-01 19:22:27 -07:00
anarquimico 0aa3c52263 Make it work with river water 2023-03-01 19:22:27 -07:00
anarquimico f4c26fb578 Change the mangrove roots to a water logged roots after using a bucket with water on it 2023-03-01 19:22:27 -07:00
FossFanatic fedae4fdd0 Fixed warped wart using stripped stem side texture 2023-02-27 17:51:14 +00:00
SmokeyDope f174b733ce Add sounds to cartography table 2023-02-25 11:46:33 +00:00
SmokeyDope b4f747bd84 Add dependencies for cartography table 2023-02-25 11:44:56 +00:00
SmokeyDope 0351556a2e Add sounds to loom 2023-02-25 11:40:45 +00:00
SmokeyDope 182f9b5dc2 Add dependencies for loom 2023-02-25 11:39:38 +00:00
SmokeyDope bd4eb01a46 Add sounds to fletching table 2023-02-25 11:31:14 +00:00
SmokeyDope 5c25901433 Add dependencies for fletching table
required to get sound working
2023-02-25 11:29:55 +00:00
SmokeyDope 2d6e1c61a2 Add placement sound to lectern 2023-02-25 10:59:05 +00:00
FossFanatic 65b1fd163b Fix fatal typo
This typo caused the game to crash, instead of spitting out an error message as it was supposed to.
2023-02-22 13:05:18 +00:00
FossFanatic ecfbb1ae07 Fix waterlogged mangrove roots textures 2023-02-18 08:54:57 +00:00
FossFanatic 14e630a1e2 Fix cauldron water textures 2023-02-18 08:53:36 +00:00
FossFanatic 62afbb4509 Remove reference to removed texture 2023-02-18 08:42:21 +00:00
FossFanatic 33bbeb1a4d Improve river water 2023-02-18 08:27:22 +00:00
FossFanatic d3253ecf4f Change small part of buckets code 2023-02-18 08:25:47 +00:00
FossFanatic 0abda8ff20 Add new function for water nodes 2023-02-18 08:25:08 +00:00
FossFanatic 624c853cb3 Improve water 2023-02-18 08:21:24 +00:00
GuyLiner e99a46b52d Removed comment 2023-02-16 20:48:30 -05:00
GuyLiner 48b16a23b6 If player in creative mode, don't drop experience from destroyed spawners 2023-02-16 19:43:50 -05:00
ancientmarinerdev b23fc6d23d Merge branch 'master' into biome_colored_foliage 2023-02-16 22:14:40 +00:00
FossFanatic 68e6965dd0 Remove excessive functions and change the appropriate stuff 2023-02-16 18:09:39 +00:00
FossFanatic 7d642c9929 Remove the tab before the curly bracket 2023-02-16 17:25:21 +00:00
emptyshore b121d0f804 Prevent placement of fire into nodes above water
This addresses the edge case where fire is set to the top of a non-water
block that represents water (such as kelp).

Note this is forbidding theoretically legitimate setups for fire over
water where fire is set to the side of a block diagonally from the
water.

Fire is still permitted next to water (so it can be set to the face of a
block diagonally from a water column).
2023-02-16 08:56:17 +13:00
FossFanatic 8f8385e4a1 Use metadata method to make player mangrove leaves 2023-02-15 18:29:56 +00:00
FossFanatic 17fc7a3256 Use metadata method to make player leaves 2023-02-15 18:29:18 +00:00
ancientmarinerdev ba708010a2 Fix incorrect crimson texture issue 2023-02-15 16:23:08 +00:00
Michieal 6601ecf788 Basic signs texture replacement. 2023-02-15 14:52:00 +00:00
Michieal 660c85dddc Changed mcl_buckets' image use to be named properly. This fixes issue #3455 2023-02-15 14:52:00 +00:00
Michieal 2d0b4dd8f7 Finished mcl_crimson. 2023-02-15 14:52:00 +00:00
FossFanatic 319beb91ce Improve vines code 2023-02-14 18:11:43 +00:00
FossFanatic bea9bbe212 Improve certain functions 2023-02-14 18:10:49 +00:00
FossFanatic 57882ae56a Merge branch 'master' into biome_colored_foliage 2023-02-14 13:27:37 +00:00
PrairieWind f62546a54f Comment out crafting white and blue dye from lily of the valley and cornflowers respectively 2023-02-13 19:37:04 -07:00
PrairieWind e3f14a3a99 Campfire API 2023-02-14 02:25:50 +00:00
ancientmarinerdev 6f98ba5118 Fix crimson mushroom naming issue 2023-02-14 02:00:19 +00:00
ancientmarinerdev f6f812257e Fix crimson name mismatch 2023-02-14 01:50:06 +00:00
Michieal b66e2a117f fix json reading error. 2023-02-14 01:50:05 +00:00
Michieal 1e61fc3069 Fixed "mcl_crimson_mcl_crimson" issue.
Fixed colors.json stupidity.
2023-02-14 01:50:05 +00:00
Michieal ef30646788 Changed mcl_crimson - finished. 2023-02-14 01:50:02 +00:00
Michieal 70e4aaa3a7 Changed mcl_crimson part 1. 2023-02-14 01:48:11 +00:00
Michieal 8bfa55fa7a Changed Salmon, Glow Squid, Cod, Cartography Table, Awards_Axolotl, Armor_Stand_Item. Glow-Ink_sac. 2023-02-14 01:43:16 +00:00
FossFanatic 3a24903a01 Add nil check 2023-02-13 15:46:45 +00:00
FossFanatic abdd5e11c0 Shorten code slightly 2023-02-13 15:46:08 +00:00
FossFanatic e17fab385b Add nil checks 2023-02-13 15:44:23 +00:00
FossFanatic 17cae6896e Add back the logical code?
My gut feeling tells me that it is somehow a bad idea to have removed this.
2023-02-13 11:17:51 +00:00
FossFanatic 4d29fab932 Improve some trees code 2023-02-13 10:22:28 +00:00
FossFanatic a2087b19a5 Delete rogue file 2023-02-13 10:20:48 +00:00
PrairieWind b79f74c390 Update Translation Template for flowers 2023-02-12 23:29:02 +00:00
PrairieWind 06f47a0756 Add Cornflowers
Evidently I didn't include the lily texture in the lily of the valley commit, so it is in this one. Again, lily of the valley texture by Nicu
2023-02-12 23:29:02 +00:00
PrairieWind ff79af26e4 Add Lily of the Valley Flower
Awesome Lily Texture by Nicu
2023-02-12 23:29:02 +00:00
ancientmarinerdev e3c8d995b5 Finish clean up# 2023-02-12 22:48:20 +00:00
ancientmarinerdev b8b45210e9 Clean up and remove old code 2023-02-12 22:48:20 +00:00
ancientmarinerdev a1f10205f6 Init age on plant so not all kelp grow to top of ocean 2023-02-12 22:48:20 +00:00
ancientmarinerdev 6f7505b6c6 Change kelp to use ABMs to solve performance issues 2023-02-12 22:48:20 +00:00
FossFanatic c88f0047c1 Merge branch 'master' into biome_colored_foliage 2023-02-12 08:44:29 +00:00
FossFanatic 0400d9a2a5 Even further improvements to some foliage code 2023-02-12 08:28:21 +00:00
FossFanatic d1ceacf7ba Improve some vines code 2023-02-12 08:22:07 +00:00
FossFanatic a70a6ef13d Improve some foliage code 2023-02-12 08:21:14 +00:00