Bakawun
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity
11,102 Commits 88 Branches 76 Tags 164 MiB
Commit Graph

4872 Commits

Author SHA1 Message Date
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
PrairieWind 194ff53400 Make sea pickles smelt into lime dye 2023-02-12 01:09:25 +00:00
FossFanatic 81dbdaab94 Adjust palette foliage check 
The excessive 128 blocks high check has been changed to now check only up to 30 blocks, since the tallest 2x2 jungle tree I seemed to get was only 29 blocks tall.

I also discovered that the search area wasn't wide enough, so sometimes the most outer leaves avoided the check. I also adjusted that.
 2023-02-11 07:53:12 +00:00
FossFanatic 1fb300ef18 Fix leaves not dropping 
Due to some renaming, leaves no longer dropped from any of the `mcl_core` trees.

This has now been fixed.
 2023-02-10 18:40:35 +00:00
FossFanatic f368fb3e43 Indentation improvements 2023-02-10 15:17:46 +00:00
FossFanatic d63ecac7cb Indentation improvements 2023-02-10 15:14:53 +00:00
FossFanatic 7fbc84971e Remove useless function 
This commit removes an useless function which wasn't really needed.
 2023-02-10 15:12:37 +00:00
FossFanatic 953044cc4b Mangrove propagules also grab biome colour on growth 2023-02-10 11:33:58 +00:00
FossFanatic 6744967d02 Make placed mangrove leaves always become player leaves 
The same thing as with the `mcl_core` leaves.
 2023-02-10 10:41:43 +00:00
FossFanatic fdb2333493 Make placed leaves always become player leaves 
Any players which still have leaves in their inventory from before this update would have had those leaves rot if someone were to break any log withing 6 nodes of the leaves if they were placed. This commit adds an `after_place_node` callback which makes sure that any leaves placed by the player, become non-rotting player leaves.
 2023-02-10 10:39:43 +00:00
FossFanatic 1defd03408 Make the function work self grown saplings 
Saplings now also get the biome's foliage colour when grown by themselves.
 2023-02-10 10:06:55 +00:00
FossFanatic d163faeb42 Use more fitting names for the newly added function 
Basically renaming anything related to leaves in the new function to something more broad such as foliage, so vines aren't indirectly considered leaves. An aesthetic change, basically.
 2023-02-10 08:08:28 +00:00
FossFanatic 197d3ae00b Make sapling foliage grab biome colour 2023-02-10 08:04:13 +00:00
Michieal f6b77aa458 reformated code. 2023-02-10 03:42:34 +00:00
Michieal 1558c852d8 Undo mesecon.register_mvps_dropper() and use abms until more research can be done. 2023-02-10 03:42:34 +00:00
Michieal 6c0525f00e Fix merge / rebase crossing massacre. 
[Michieal] 83bc60722d Begin: make bamboo dig-able by Pistons for Farm Creation.

[Michieal] 449cbdb330 Make Bamboo & Bamboo items not sticky for pistons.

[Michieal] a44566f863 hijack the ABM to check for orphaned bamboo nodes.

[Michieal] 5dff9e1994 Fixed the ABM situation so that now bamboo "breaks" when pushed by pistons.
Probably not the most elegant, but hey. It works.

[Michieal] 76507025d9 Cleaned up the global function to match the current ABM.

[Michieal] dfa849e19a Merge branch 'master' into Bamboo-Piston-Dig

[Michieal] a5bdc8a166 fix bamboo mosaic recipe.

[Michieal] 14383d6c6f update mod.conf to use optional depends mesecons_mvps

[Michieal] f81d530912 Update init.lua to register dropper callback.
 2023-02-10 03:42:34 +00:00
ancientmarinerdev 3c13ce1d6b Merge pull request 'Fix "mcl_core:dirt_with_dry_grass" to be "mcl_core:dirt_with_grass" with the savanna color index.' (#3408) from fix_dirt_dry_grass into master 
Reviewed-on: MineClone2/MineClone2#3408
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-10 02:50:27 +00:00
PrairieWind 70fb4f8a0d Fixed weather not clearing after sleep 
Isnt as clean as it should be because making it clean made some very funky results
 2023-02-10 01:51:28 +00:00
FossFanatic 169019096e Change the waterlily code 
Waterlilies now use a brownish grey texture with a coded hex colour.
 2023-02-09 09:46:18 +00:00
SmokeyDope dfbee5cb93 Add "mushroom" to the warped fungus and crimson fungus item descriptions for creative search 2023-02-09 03:22:17 +00:00
SmokeyDope 378af531a9 remove "mushroom" from the names of crimson fungus and warped fungus 2023-02-09 03:22:17 +00:00
FossFanatic f4e8088e60 Improve mangrove leaves 
This commit makes it so mangrove leaves also no longer use `param2` to see if they rot or not. The leaves also use the biome colours now.
 2023-02-08 16:13:13 +00:00
FossFanatic 198375a18e Change stuff in mcl_core 
Simply put, this commit changes some code so that leaves don't use `param2` to see if they rot or not, and will now use the biome colours.

This commit also makes it so vines do the same (use biome colours).
 2023-02-08 16:11:38 +00:00
anarquimico e2de5908c7 5th ITEMS batch 2023-02-07 16:39:24 +00:00
anarquimico 439c879508 4th batch of ITEMs translation 2023-02-07 16:39:23 +00:00
anarquimico 67977b0d26 Third batch of ITEMS translation 2023-02-07 16:39:23 +00:00
anarquimico ed8c3e7d26 Second batch of ITEMS translated 2023-02-07 16:39:22 +00:00
anarquimico 7add59992f First batch of ITEMS translation 2023-02-07 16:39:22 +00:00
Michieal ef4e4b1b7b Merge branch 'master' into fix_copper_blocks 2023-02-06 16:58:38 -05:00
Michieal 0e000e6491 Merge branch 'master' into fix_dirt_dry_grass 2023-02-06 16:55:14 -05:00
Michieal ec7a97ba3e Made LBM run at every load, so that it catches anything missed from previous passes. 2023-02-06 16:54:23 -05:00
SmokeyDope 48eb934d64 Add compostability to warped wart blocks and shroomlight 2023-02-06 13:08:28 -07:00
SmokeyDope 88cf3a5900 Add compostability to nether sprouts 2023-02-06 13:08:27 -07:00
SmokeyDope 1401652015 Add compostability to warped roots and crimson roots 2023-02-06 13:08:26 -07:00
SmokeyDope cac6e15736 Add compostability to twisting vines and weeping vines 2023-02-06 13:08:24 -07:00
SmokeyDope 156d096a78 Add compostability to warped fungus and crimson fungus 2023-02-06 13:08:23 -07:00
Michieal de00b7228e Fix "mcl_core:dirt_with_dry_grass" to be "mcl_core:dirt_with_grass" with the savanna color index. 2023-02-05 21:17:53 -05:00
GuyLiner 4d922d9edf Added conditional based on existing fire damage conditional that will apply fire damage to a 
mob standing on top of a magma node that belongs to the "fire" group. The magma node
has also been added to the fire group, making it so that standing on the node will
do damage to the mob.

In official Minecraft, magma blocks just do fire damage without the fire animation.
Source: https://minecraft.fandom.com/wiki/Magma_Block
 2023-02-06 00:10:52 +00:00
Michieal 46ca650ea4 further optimize and reformat mcl_honey's init.lua 2023-02-04 16:31:18 -05:00
Michieal c4e4a8e4d2 Move Waxing function to MCL_Honey. Remove commented code. 2023-02-04 03:31:11 -05:00
Michieal 08610296fc Merge branch 'master' into fix_copper_blocks 2023-02-04 03:30:20 -05:00
ancientmarinerdev 7d46fa3362 Merge pull request 'texture-consolidation' (#3380) from texture-consolidation into master 
Reviewed-on: MineClone2/MineClone2#3380
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-04 03:23:13 +00:00
ancientmarinerdev 58a08ea697 Merge pull request 'fix incorrect digtypes and missing sounds for some nether blocks' (#3351) from SmokeyDope/MineClone2:master into master 
Reviewed-on: MineClone2/MineClone2#3351
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-04 00:27:48 +00:00
Michieal 50effaa807 Made Requested changes from Pull Request. 2023-02-03 14:09:16 -05:00
SmokeyDope 08df1fe02f Update overworld vine breaking logic with vector.offset 2023-02-03 00:50:25 +00:00
SmokeyDope bc4d9211cb Update nether vine breaking logic with vector.offset 2023-02-03 00:43:17 +00:00
SmokeyDope cf05771e30 remove unnecessary blank line 2023-02-02 23:12:09 +00:00
SmokeyDope 16a6dcb66c Completely remove selection box for warped fungus 
Recommended by Michael
 2023-02-02 22:45:06 +00:00
SmokeyDope 89eb458df7 Fix up indentation for warped and crimson wart block sounds part 2 2023-02-02 22:42:44 +00:00
SmokeyDope eae1ee7cee Fix indentation for shapeless type @ netherite ingot 2023-02-02 22:39:37 +00:00
SmokeyDope 27f5a94c6a Fix up indentation for warped and crimson wart block sounds 2023-02-02 22:36:33 +00:00
SmokeyDope b4719599b5 Fix up indentation 2023-02-02 22:30:15 +00:00
SmokeyDope 659f11bf6f Fixed up indentation and removed excess blank lines 2023-02-02 22:08:37 +00:00
SmokeyDope 88a7a8afab Removed handy, axey, swordy, from nether vines & removed useless comments 2023-02-02 21:37:23 +00:00