Michieal
/
MineClone2_For_PRs
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity
5,092 Commits 75 Branches 76 Tags 168 MiB
Commit Graph

2464 Commits

Author SHA1 Message Date
Brandon 5637701c4b Correct indentation 2020-08-08 17:51:39 -04:00
Brandon d6c7c9dcd0 Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 into master 2020-08-08 17:51:09 -04:00
Brandon 9024c8084d Update how "on_use" is defined for potions. 2020-08-08 17:48:03 -04:00
Wuzzy db1cc2e012 Effect command: Swap arguments 2020-08-08 10:25:23 +02:00
Wuzzy aaa13878c1 Clean up the effect test command a little 2020-08-08 10:14:37 +02:00
Wuzzy a472c30163 Fix indentations in mcl_potions/mcl_brewing 2020-08-08 10:00:16 +02:00
Wuzzy 7104bbd2df Remove tt strings for WIP potions for now 2020-08-08 09:32:38 +02:00
Wuzzy c373c972b3 Fix typo in mcl_brewing: comination 2020-08-08 09:28:47 +02:00
Brandon 48fae05040 Fix problem with charging double potion effect when hit by a tipped_arrow 2020-08-06 17:44:16 -04:00
Brandon 0cfd16fb17 Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 into master 2020-08-06 17:31:21 -04:00
Brandon 128e98ca4d Delete dead code 2020-08-06 17:30:49 -04:00
Brandon 0e462ef883 Update potions to not break on contact with liquid nodes. 2020-08-06 17:30:28 -04:00
kay27 6ba7ba981d Russian translation of mcl_potions, mcl_brewing 2020-08-06 19:15:59 +04:00
Brandon 49a5f765bd Save player effects on server shutdown. 2020-08-05 20:18:18 -04:00
Brandon cfcaa4fa12 Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2020-08-05 20:03:56 -04:00
Wuzzy 2e9231ac56 Remove dead chorus flower from Creative 2020-08-05 21:00:30 +02:00
Wuzzy fd724f4c1c Lingering heal/harm potions change at least 1 HP 2020-08-05 20:59:16 +02:00
Wuzzy 3deac5a1c6 Add crafting recipe for dragon's breath 2020-08-05 20:55:07 +02:00
Wuzzy ed6604ee56 Remove incorrect dead chorus flower tooltip 2020-08-05 20:44:41 +02:00
Wuzzy 402205d1ed Do not hide alive chorus flower in Creative 2020-08-05 20:40:34 +02:00
Wuzzy 92591b37dc Make throwable potion entities non-pointable 2020-08-05 20:38:51 +02:00
Wuzzy f5032503d0 Remove dead code in mcl_potions 2020-08-05 20:04:12 +02:00
Wuzzy 53c83a3479 Fix German translation mistake 2020-08-05 19:58:04 +02:00
Wuzzy 1834be9e46 Lingering potion: Reduce timer by constant value 2020-08-05 19:53:14 +02:00
Wuzzy 50bd1b9d5e Update water bottle translate 2020-08-05 19:47:13 +02:00
Wuzzy ff476c29b6 Better lingering for lingering water bottle 2020-08-05 19:44:19 +02:00
Wuzzy 9c304105e9 Add special particles for throwable water bottles 2020-08-05 19:29:21 +02:00
Wuzzy 20455a259f Tweak splash potion particles 2020-08-05 19:06:32 +02:00
Wuzzy 1f8488aba5 Make throwable water bottles useful 2020-08-05 19:00:08 +02:00
Wuzzy 13963d00e5 Fix missing definition of age_next in mcl_fire 2020-08-05 18:04:37 +02:00
Wuzzy b1b50df9ab Add more help to brewing stand 2020-08-05 15:48:28 +02:00
Wuzzy f1616e522a Fix another German typo 2020-08-05 15:26:35 +02:00
Wuzzy 41cf1a4362 Fix some translation typos in German 2020-08-05 15:24:15 +02:00
Wuzzy b49bcda0ac Fix get_translator in mcl_brewing 2020-08-05 15:20:08 +02:00
Wuzzy cbf545ee12 Update mcl_potions translation template and German 2020-08-05 15:18:36 +02:00
Wuzzy e519c62c8b Clean up more potion-related strings 2020-08-05 15:18:30 +02:00
Wuzzy 87bf6c12b2 Add German potion translation 2020-08-05 14:49:23 +02:00
Wuzzy e20a630a19 mcl_brewing, mcl_potions: Update transl. templates 2020-08-05 14:24:21 +02:00
Wuzzy 431cd63865 Add mod.conf to mcl_potions 2020-08-05 14:21:48 +02:00
Wuzzy fe40936065 Remove redundant arrow help string definition 2020-08-05 14:20:53 +02:00
Wuzzy c051a95dae Fix typo in mcl_brewing 2020-08-05 13:56:49 +02:00
Brandon b9a9b1b814 Add pretty weak version of chat commands to give oneself potion effects - for testing 2020-08-03 12:47:42 -04:00
Brandon 4c05c2e70c Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2020-08-02 20:51:27 -04:00
Brandon 67e4e814f4 move hudbar stuff outside initial statement. 2020-08-02 20:50:29 -04:00
Brandon af1ab424fc Allow potion effects to remain after player logs off. 2020-08-02 20:44:18 -04:00
kay27 125840c9e4 Fix bucket stacks Wuzzy/MineClone2#745 by removing leftovers of metadata usage 2020-08-02 19:46:09 +04:00
kay27 afc6a1bb0f Localize variable in mcl_beds 2020-08-02 05:05:02 +04:00
Brandon 0a5cb628c5 make lowercase to conform to Wuzzy's previous commit. 2020-08-01 08:42:31 -04:00
Brandon 5e26cfcf3d Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2020-08-01 08:40:41 -04:00
Brandon 2ca2f25e58 Correct tooltip for healing/harming potions 2020-08-01 08:39:50 -04:00
Brandon acea309564 Add poison effect for pufferfish, remove mcl_hunger control for pufferfish effect 2020-08-01 08:36:22 -04:00
Wuzzy c63028801b Write potion help texts 2020-08-01 03:20:52 +02:00
Wuzzy fb3fade4eb Remove dead code in mcl_brewing 2020-08-01 02:15:48 +02:00
Wuzzy 5af124d732 Tweak potion tooltips 2020-07-31 10:43:42 +02:00
Wuzzy 3b95498092 Clean up potion/arrow names 2020-07-31 10:41:44 +02:00
kay27 64f9e39ebd slighty optimize the code 2020-07-31 09:58:28 +02:00
kay27 92385364e5 Fix beds #798 attempt 5 2020-07-31 09:58:28 +02:00
Wuzzy 50fa36aa2c Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2020-07-29 21:24:49 +02:00
Brandon 78bee21a82 Allow dragon's breath to stack to 64 2020-07-28 17:02:43 -04:00
Brandon fd6028e451 Cleanup HUD bar mechanics 2020-07-27 19:41:07 -04:00
Brandon 9a32bdc967 Update HUD for poison/regen. 2020-07-27 19:17:04 -04:00
Brandon bdd92c6cdb update poison to swap hudbar icons and remove old dead functions 2020-07-27 17:32:48 -04:00
Elias Åström a8eca09822 Fix on_blast for chorus flower crashing 2020-07-27 19:44:55 +02:00
Elias Åström 91b6213e0b Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2020-07-27 19:28:46 +02:00
Elias Åström e85c00ea02 Show custom name in UI of Chest and Shulker Box 2020-07-27 19:26:01 +02:00
Wuzzy 0cc179acc6 Add warning about bed velocity 2020-07-27 07:49:54 +02:00
kay27 7d1f8ac314 Velocity check adjusted in mcl_beds 2020-07-27 07:49:54 +02:00
kay27 c78270e70b Bed occupation fix 2020-07-27 07:49:54 +02:00
Brandon 6eb810339b Cleanup potion functions - check for player effects at login to ensure no holdovers exist 2020-07-26 17:42:38 -04:00
Elias Åström 37c05cb840 Also save the name when a shulker is placed 
Previously only the description was saved in the node meta.
 2020-07-26 18:01:36 +02:00
Elias Åström 6095ae17b1 Merge remote-tracking branch 'dbeans/master' 2020-07-26 17:50:09 +02:00
Elias Åström 4827d2a83a Update anvil maximum name length to 35 2020-07-26 17:39:55 +02:00
Brandon 9ef57692ba A little more code cleanup 2020-07-26 07:48:40 -04:00
Lizzy Fleckenstein a31ed90a81 Proper model 2020-07-26 13:28:13 +02:00
Brandon 9dce5581be Code cleanup 2020-07-25 20:59:26 -04:00
Brandon d22805cecd Clean up potion functions. Correct fault where it's possible to index a nil value. 2020-07-25 20:40:13 -04:00
Brandon 834ce1f611 Correct issue where awkward splash wouldn't brew 2020-07-25 15:27:04 -04:00
Brandon e5f0370c17 Correct arrow naming convention 2020-07-25 15:26:42 -04:00
Brandon e603a08f3c Correct potion color scheme 2020-07-25 15:26:22 -04:00
Lizzy Fleckenstein 21c6815839 Added End Crystal 2020-07-25 13:32:35 +02:00
Brandon bf38131520 Corrected poison and other damage functions 2020-07-24 19:39:23 -04:00
Brandon a53a98fff6 updated arrow color scheme. 2020-07-24 19:22:57 -04:00
Brandon 8c5943b34c Correct other issues in inverting swiftness. 2020-07-24 19:15:00 -04:00
Brandon ebfe9674e1 Correct issue with inverting swiftness to slowness. 2020-07-24 19:12:03 -04:00
Brandon c37e43df4e Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2020-07-24 19:05:14 -04:00
Brandon d228da1da7 allow stackable dragon breath 2020-07-24 19:02:54 -04:00
kay27 d76b1a9065 Russian translation: commandblock: advanced topics/usage 2020-07-24 19:10:58 +02:00
kay27 e19c00cd44 Russian translation: mcl_maps 2020-07-24 19:09:17 +02:00
dBeans f961a72c33 Make shulker boxes preserve name when placed 2020-07-24 12:44:21 +02:00
Wuzzy cd3e87bf57 Fix duplicate help entries for brewing stand 2020-07-23 23:23:03 +02:00
Wuzzy e3c22cb072 Move depends to mod.conf in mcl_brewing 2020-07-23 23:16:36 +02:00
Wuzzy fa76f81f92 Change mcl_brewing file permissions 2020-07-23 23:15:37 +02:00
Wuzzy a430772c16 Fix incorrect string in mesecons_commandblock 2020-07-23 22:43:16 +02:00
Wuzzy ee52990db1 Remove empty Russian translation of mcl_maps 2020-07-23 22:36:25 +02:00
Wuzzy 7c93f3f9f7 Remove trailing spaces in Russian translation 2020-07-23 22:35:09 +02:00
Wuzzy ac518fa548 Merge branch 'master' of https://git.minetest.land/kay2777/MineClone2 into ru 2020-07-23 22:33:10 +02:00
Brandon dc3a991705 Correct crash from on_use = nil 2020-07-22 17:57:02 -04:00
Brandon 8ac54febba Adjust dragon's breath color and don't splash it 2020-07-22 17:52:47 -04:00
Brandon f2906bee3a Add really cool header text 2020-07-22 17:46:49 -04:00
Brandon 927ba10c34 Update dragon breath image. 2020-07-22 17:46:34 -04:00
Brandon b45b4a44e5 Add brewable dragons breath with chorus flower 2020-07-22 17:42:10 -04:00
Brandon c4271cf13d Correct crash when no arrow is in the inventory and the bow is drawn. 2020-07-21 18:55:41 -04:00
Brandon 623f60ab79 correct elseif statement 2020-07-20 19:50:17 -04:00
Brandon 31f57a51e0 give bow a bit more power... 2020-07-20 19:49:10 -04:00
Brandon 843f2d2a80 Correct issue where player/entities dies before effect is given 2020-07-20 19:48:58 -04:00
Brandon 43c4b355ce Fix issue with objects/players dying before the effect runs, which won't be applied... 2020-07-20 19:07:10 -04:00
Brandon bb5aa33bad Remove splash potion arrow recipe 2020-07-20 18:36:37 -04:00
kay27 0b05431285 Merge remote-tracking branch 'upstream/master' 2020-07-20 19:44:06 +00:00
Brandon 26315d44cf Add the ability to give use lingering potions to tip arrows. 
Corrected issue with bow not finding potion arrows in inventory.
 2020-07-19 21:08:50 -04:00
kay27 ba51686e6c Russian translation 2020-07-20 00:11:13 +00:00
Brandon 0f5b6b7ce0 Initial commit to potion tipped arrows. 2020-07-19 18:56:18 -04:00
Brandon fa86a09fd5 Add splash/lingering water 2020-07-17 17:25:49 -04:00
Brandon 2b4b37a439 Update longdesc for mundane and thick potions 2020-07-17 17:09:51 -04:00
Brandon 787769cb92 Fix brewing thick potions and splash water potions 2020-07-17 17:05:40 -04:00
Brandon 5e77c90bb7 adjust tooltip generation - use even numbers of 5 2020-07-16 21:02:21 -04:00
Brandon 850edb564d Scale down leaping potion effect, cleanup tooltip generation. 2020-07-16 20:56:00 -04:00
Brandon 64a2a6bb53 Move variable declaration out of loops to increase performance. 2020-07-16 20:20:13 -04:00
Brandon 1dda98fa4c Move variable declaration out of loops for better performance. Correct for dropping duplicate items on break. 2020-07-16 20:14:57 -04:00
Elias Åström ca9578d50c Make dried kelp craftable from dried kelp block 2020-07-17 00:17:18 +02:00
Brandon b9ba1300f9 Correct missing declaration of local param 2020-07-12 21:15:54 -04:00
Brandon ad5759a5ad Update method for harming by heal to mob attributes 2020-07-12 16:56:41 -04:00
Brandon 10f2dcb53a Correct splash potions with no executable function 2020-07-12 12:32:54 -04:00
Brandon 4a654fccc4 Correct potions hitting thrower. 2020-07-12 12:16:26 -04:00
Brandon 9602e0d8af add "use" to useage help 2020-07-12 11:58:34 -04:00
Brandon d6e72a9c98 add "use" to translations 2020-07-12 11:58:06 -04:00
Brandon 982c976a83 Reduce player particles on effect 2020-07-12 09:44:45 -04:00
Brandon fae5c8284e Add speckled melon to the craft guide. 2020-07-12 08:58:22 -04:00
Brandon 25d092a95e Update potions to not hit player feet when thrown. 2020-07-12 08:50:48 -04:00
Brandon 323223e5a1 Correct missing "use" 2020-07-12 08:28:18 -04:00
Brandon 51c311a258 Update definition for healing/harming potions 2020-07-12 08:20:56 -04:00
Brandon a6dac52797 Move Lingering potion generation into single call 2020-07-12 07:59:29 -04:00
Brandon e3becf443e Correct Splash registration of "+" variant 2020-07-12 07:35:11 -04:00
Brandon 8f079d11be Move Splash potion generation into single call 2020-07-12 07:18:54 -04:00
Brandon 922a42756e update function definitions without effect to nil 2020-07-11 20:34:19 -04:00
Brandon 926d842cdb reduce redundant code in potion definitions 2020-07-11 20:26:45 -04:00
Brandon 7670c9ba5c Update some tooltips 2020-07-11 14:27:37 -04:00
Brandon d7f204def6 tabs 2020-07-11 14:19:38 -04:00
Brandon 5981c0756b work on chaning how potions are created 2020-07-11 13:40:48 -04:00
Brandon 64046d2c5f update for dispenser compatibility 2020-07-11 09:07:27 -04:00
Brandon 555e122387 Merge branch 'bzoss_brew' 2020-07-11 08:06:08 -04:00
Wuzzy 0f1c369011 Fix broken French translation for mcl_mushrooms 2020-07-11 12:21:22 +02:00
Wuzzy d230543567 Fix incorrect peony/rosebush descriptions 2020-07-11 11:53:08 +02:00
Wuzzy 1ef4c63e03 Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2020-07-11 11:44:48 +02:00
Wuzzy 5125f6d739 Merge branch 'rootyjr_enderman' 2020-07-11 11:32:50 +02:00
Brandon 0422a6410e Comment strength/weakness 2020-07-10 19:26:30 -04:00
Brandon ac13dd2a71 Comment weakness/strength potions 2020-07-10 19:25:34 -04:00
Brandon d1b7184e7d Comment weakness/strength 2020-07-10 19:22:11 -04:00
Brandon 1fda285102 Fix reset for night vision on drink milk 2020-07-10 19:16:23 -04:00
Brandon 16c886f0ec Update Night Vision to allow full day brightness - only active at night. 2020-07-10 19:10:38 -04:00
Brandon 90b902a228 update formspec with translatable label 2020-07-10 18:29:41 -04:00