ClementMR
/
VoxeLibre
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity
11,335 Commits 106 Branches 83 Tags 187 MiB
Commit Graph

11335 Commits

Author SHA1 Message Date
seventeenthShulker 6125d625bc Fix prismarine bricks and dark variant blast res. 
Should be 6 like regular prismarine
 2023-09-17 13:49:00 +02:00
seventeenthShulker 26e8737031 Un-hardcode blast resistance, hardness for walls, 
now only based on their material
 2023-09-17 13:47:18 +02:00
seventeenthShulker a1e20f2916 All wood-type and nether-type fences now match material's blast resistance 2023-09-16 22:57:15 +02:00
ancientmarinerdev b4c693bb20 Merge pull request 'Campfire Updates' (#3769) from campfire_update into master 
Reviewed-on: MineClone2/MineClone2#3769
 2023-09-04 22:20:48 +00:00
ancientmarinerdev bd46428d65 Updated credits 2023-09-04 22:05:38 +00:00
ancientmarinerdev 9e53efbc3e Fix campfire smoke timing 2023-09-04 22:05:38 +00:00
ancientmarinerdev 6b36abfe91 Fix credits 2023-09-04 22:05:38 +00:00
ancientmarinerdev 49e7449d7f Implement feedback and add credit 2023-09-04 22:05:38 +00:00
ancientmarinerdev 1d28a8e4ac Convert campfire particle spawning from ABM to particle spawner 2023-09-04 22:05:38 +00:00
Wbjitscool c32e88e910 Add better smoke particles 2023-09-04 22:05:38 +00:00
thunder1035 969fa98f18 Update campfire model and textures 2023-09-04 22:05:38 +00:00
PrairieWind 107420c80f Offset smoke a bit 2023-09-04 22:05:38 +00:00
PrairieWind f9afc74077 Add changes to campfires from feedback 2023-09-04 22:05:38 +00:00
PrairieWind 21f0c7750b Throw experience points after food is cooked 2023-09-04 22:05:38 +00:00
PrairieWind 04b59b2190 Campfires are unaffected by pistons 2023-09-04 22:05:38 +00:00
PrairieWind 15bb4fa4bf Players don't take burn damage when they have fire resistance potion in use, or frost walker boots 
Entities seem to not burn anymore, and I am not sure why.
 2023-09-04 22:05:38 +00:00
PrairieWind 4c3e521779 Fix campfire drops to work correctly with creative and silk touch 2023-09-04 22:05:38 +00:00
DinoNuggies4665 4c59b189dd changed line 82 to vector.new(), and refactored setting food wield item (wield_image doesn't matter) 2023-09-04 22:05:38 +00:00
PrairieWind 23d6c3d17b Update campfire rightclick and smothering 2023-09-04 22:05:38 +00:00
DinoNuggies4665 61f489e71f Food entities don't turn back to mutton when leaving a re-joining now 2023-09-04 22:05:38 +00:00
DinoNuggies4665 4616b6c3ec The food is now oriented the right direction when on the cooking on the campfire, and food entities are removed when the campfire is destroyed, still doesn't drop items though 2023-09-04 22:05:38 +00:00
DinoNuggies4665 d92296712c Fixed crash when standing on campfire whilst food is cooking 2023-09-04 22:05:38 +00:00
DinoNuggies4665 5b212dd3fe Made food entities local to evcery campfire, and made one food entity that works for all foods 2023-09-04 22:05:38 +00:00
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
ancientmarinerdev cb407666a4 Merge pull request 'Ensure creepers work by raycast line of sight' (#3905) from raycast_creeper_sight into master 
Reviewed-on: MineClone2/MineClone2#3905
 2023-09-03 22:14:41 +00:00
ancientmarinerdev 969a08b7be Clean up 2023-09-03 22:02:34 +00:00
ancientmarinerdev 1749712318 Change creepers line of sight check to raycast and do it from eyes to targets feet and head 2023-09-03 22:02:34 +00:00
ancientmarinerdev a648e53699 Merge pull request 'Import villager trade changes by Alessandra_Lozoya' (#3854) from Codiac/MineClone2:trades into master 
Reviewed-on: MineClone2/MineClone2#3854
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-09-02 15:44:13 +00:00
ancientmarinerdev b0208e622b Merge pull request 'Fix cherry chest boat inv texture' (#3865) from cherry_boat into master 
Reviewed-on: MineClone2/MineClone2#3865
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
 2023-09-02 10:01:20 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 8c41fb53e3 Fix cherry chest boat inv texture 2023-09-02 10:00:31 +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
Codiac 98e7cd6e8e Merge branch 'master' into trades 2023-09-02 04:15:42 +00: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
ancientmarinerdev c6256295a7 Merge pull request 'fix barrel sound code for proper max hear distance' (#3900) from fix_barrel_sound_distance into master 
Reviewed-on: MineClone2/MineClone2#3900
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-08-31 22:56:20 +00:00
SmokeyDope b911f99d23 fix barrel sound code for proper max hear distance 2023-08-31 22:55:21 +00:00
ancientmarinerdev 273165ce3b Merge pull request 'lower ruined portal structure spawn rate' (#3901) from lower_ruined_portal_generation_rate into master 
Reviewed-on: MineClone2/MineClone2#3901
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-08-31 22:47:51 +00:00
SmokeyDope aa08a176fc lower ruined portal structure spawn rate 2023-08-31 22:47:02 +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
Sab Pyrope 5b4a79a26d Update russian translation 2023-08-31 14:16:42 +08: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