1
0
mirror of https://github.com/Zrips/Jobs.git synced 2024-12-03 07:54:07 +01:00
Commit Graph

1213 Commits

Author SHA1 Message Date
montlikadani
3920fb167d New Crowdin updates 2021-01-06 12:10:18 +01:00
Zrips
49ebf6ee88 Increasing McMMO skill timer from 30 seconds to 60 2021-01-06 13:03:05 +02:00
montlikadani
b1b39a789d Added option to allow enchanting boosted items
Closes #1011
2021-01-01 16:31:38 +01:00
montlikadani
a8dd65cb4b Make payment messages display in chat if setting is disabled per config
Closes #1031
Closes #1023
2020-12-23 20:08:02 +01:00
montlikadani
89649acb9e StackMobs build seems to be working 2020-12-18 20:15:45 +01:00
Zrips
8cd5061ece Lets load points too when changing servers 2020-12-17 17:58:57 +02:00
Zrips
adf91bea98 Properly loading payment limits in multi server environment 2020-12-17 17:50:00 +02:00
Zrips
48ec2bdbf0 Merge branch 'master' of https://github.com/Zrips/Jobs.git 2020-12-17 17:26:49 +02:00
montlikadani
ed3ce013d6 New Crowdin updates 2020-12-17 16:26:13 +01:00
Zrips
3637c77f42 Fix for log stripping 2020-12-17 17:25:53 +02:00
montlikadani
03dee3da8e Remove redundant fields from heap 2020-12-17 16:21:51 +01:00
Zrips
7544eea2ac Properly loading archived jobs when running network 2020-12-17 17:16:48 +02:00
Zrips
c97beba83d Lets remove entries of BP from database before loading if timer is done 2020-12-17 16:20:19 +02:00
Zrips
a9540c784e Lets record BP when player places block in any situation if bp is set 2020-12-17 15:16:30 +02:00
Zrips
751b57095f Fixing bp command issue with newer server versions 2020-12-17 14:11:03 +02:00
Zrips
15ae2988e0 Fix for incorrect archive command locale source 2020-12-17 13:32:27 +02:00
Zrips
401a6d8780 Last thing for job migration 2020-12-17 13:05:35 +02:00
Zrips
3eed42cfaa Extra adjustments for job migration 2020-12-17 12:50:56 +02:00
Zrips
3f16abdc80 Fixing job migration 2020-12-16 17:31:09 +02:00
Zrips
32ffb88e9d Fix for max permission node not being taken properly when you have
multiple of those
2020-12-16 13:53:39 +02:00
Zrips
fa040ee619 Tiny clean 2020-12-16 13:34:53 +02:00
montlikadani
2e5ee5bd6f Added placeholders to show user archived jobs level and exp
Closes #1022
2020-12-15 13:42:34 +01:00
montlikadani
aa13457348 Fix when some complexed placeholders not worked 2020-12-13 18:59:37 +01:00
montlikadani
bb135043b5 Fix remained action types of job not included on the next page
Instead it duplicated the existing ones
2020-12-07 17:52:57 +01:00
montlikadani
1daf097f2e Lets load the job files
- Removed more synchronized methods
- Added slot option to example job to remind users there is sorting
2020-12-07 17:10:04 +01:00
montlikadani
d158059759 Add example job 2020-12-05 18:44:39 +01:00
montlikadani
7f9c125c55 here too 2020-12-05 17:41:00 +01:00
montlikadani
67614adc76 Get rid of some synchronized to do not slow down the server process 2020-12-05 17:30:11 +01:00
montlikadani
e3635193a5 Fix when the first time the jobs not generated 2020-12-05 17:26:07 +01:00
montlikadani
ef4927c23f
Separate jobs into files (#1017)
Closes #1017
2020-12-05 16:40:20 +01:00
montlikadani
580ce6d555 Fix NPE related to MythicMobs display name
Fixes #1015
2020-12-05 14:04:52 +01:00
Zrips
b4c52835e6 Lets keep it compatible with java 8 2020-12-01 14:23:43 +02:00
montlikadani
073192c3b0 Fix some database loading issues
For example if we have set up auto cleaning users, the time is already exceed and the users will not get removed from database. Somehow the database always closed on reloading plugin that caused to not perform database actions

Fixes #1007
2020-11-30 21:39:04 +01:00
montlikadani
e8eae4d4e2 Lets avoid generating all known materials in old versions
This changes will not generating 1.16 materials in 1.8 servers in the translatable file
2020-11-30 10:27:09 +01:00
montlikadani
ec2d4a1846 Exclude some things from pom 2020-11-24 20:52:32 +01:00
montlikadani
891262ca00 Document some of api events 2020-11-24 20:43:58 +01:00
montlikadani
516df9ad01 Re-add this old permission 2020-11-23 20:29:00 +01:00
montlikadani
343657db05 Now you can separate payment materials into a list 2020-11-23 20:11:21 +01:00
montlikadani
e4f2b40527 Petpay permission should now affect wolfs as tameable entity 2020-11-21 12:11:34 +01:00
montlikadani
1d58e4bd66 Misc changes 2020-11-17 09:52:38 +01:00
montlikadani
e24dba84a6 Add permission based max quests
Closes #964
Closes #809
2020-11-16 21:57:09 +01:00
montlikadani
416ad5f8e7 Calculate the max jobs variable for equations 2020-11-16 19:42:33 +01:00
montlikadani
ec0670007c Add maxjobs variable to equations
Closes #883
2020-11-16 19:15:30 +01:00
montlikadani
d019cbafb1 Max jobs placeholder should return the permission value
Fixes #983
2020-11-16 18:34:25 +01:00
montlikadani
d70d2e7918 Now you can craft items in the smithing table to get income
Closes #1002
2020-11-16 18:12:57 +01:00
montlikadani
2ff77210b8 Fix when smaller boost values takes precendence over largest
Fixes #984
2020-11-13 09:08:45 +01:00
montlikadani
f55c02570e Fix nearspawner does not accepts minus values
Fixes #998
2020-11-13 08:04:03 +01:00
montlikadani
f7313be846 Call some database things in async to do not cause server freeze on startup
Fixes #981
2020-11-05 18:26:27 +01:00
montlikadani
94189783bc Add %jobsr_user_quests% placeholder to show available quests from jobs
Closes #989
2020-11-05 16:43:59 +01:00
montlikadani
89280f05f2 Fix right clicking on cow and get paid without bucket
Fixes #991
2020-11-05 16:21:58 +01:00
montlikadani
9c34ccdcec Fix smelt action not works for some block result
Fixes #990
2020-11-05 15:11:37 +01:00
montlikadani
47c9fc4724 New Crowdin updates 2020-10-30 15:07:57 +01:00
Zrips
f58abe3827 PaymentLimit should ignore timer when checking if user is under limit 2020-10-30 15:45:22 +02:00
Zrips
3d48656311 Updating payment limit handling 2020-10-30 14:29:36 +02:00
Zrips
07e97f50ae Fixing top command skipping some of the entries 2020-10-30 12:26:04 +02:00
Zrips
383bf5da2d Fixing duplicated points records in database 2020-10-29 14:29:12 +02:00
Zrips
9adcc1593e Fix for gtop incorrect listing numbers 2020-10-29 13:40:27 +02:00
Zrips
874fd3ce5c Allow negative values for boost permissions 2020-10-29 12:40:12 +02:00
montlikadani
f5d4302717 Now you can set tax permissions for money & points
Closes #455
2020-10-26 18:43:29 +01:00
montlikadani
aebcd6bffc Do not print out exception about invalid configuration, we only need the line of the file 2020-10-26 17:38:04 +01:00
montlikadani
35fb74e2e3 Fix gtop & top sent wrong error message about usage
- Fixed gtop pagination when reached the maximum pages, but added one more

Closes #977
2020-10-24 16:46:05 +02:00
montlikadani
21673860c7 Fix different logic behavior for fast payment 2020-10-23 16:53:49 +02:00
montlikadani
22d985f0b4 Added option to send title and chat message when a player reached the max level of a job
Closes #971
2020-10-22 15:50:31 +02:00
montlikadani
be86d3e845 Remove these 2020-10-22 14:45:13 +02:00
montlikadani
f1194bfd32 Properly handle subTypes for "all" identifier
- Fix build
2020-10-22 13:10:37 +02:00
montlikadani
b00a8762f3 Fix some issues related to ownership handling when disabled
Closes #972
2020-10-22 12:26:32 +02:00
montlikadani
0c4a43e6cc Removed Boss dependency
- Fix for mushroom cow can't be milked with bowl
- Now pig_zombie will automatically changes to piglin in 1.16+ versions (for lazy peoples)
2020-10-21 17:31:32 +02:00
kikelkik
081b02c7df
Added "color-all" identifier for shear action (#970)
Closes #966
2020-10-21 17:28:19 +02:00
Futurixel
58bcb0d45a
Fix stonecutter exploit when craft action called multiple times (#965) 2020-10-18 16:32:03 +02:00
montlikadani
bc00105bde Change these 2020-10-17 18:35:40 +02:00
montlikadani
90a7267e0d Add schedule command to enable schedules
Closes #671
2020-10-17 18:16:07 +02:00
montlikadani
2c5dcbc5a1 Fix for job titles not working due to tests 2020-10-13 18:48:12 +02:00
montlikadani
ac11fbed6a Improve job schedulers by using runTaskTimer instead of odd sync repeat
Fixes #928
2020-10-13 16:52:56 +02:00
montlikadani
674529e77a Forgot to check for version 2020-10-12 12:44:03 +02:00
montlikadani
3059833910 Rework how the brewing stand, smoker... getting registered
As of new blocks like smoker, blast furnace this owner ship registration should be reworked to make more readable and less code. In this change it has so many deprecations, but its commented out.
2020-10-12 12:42:50 +02:00
montlikadani
4a35431be8 Fix for stripping logs not works from tests
Fixes #955
2020-10-11 16:16:01 +02:00
montlikadani
9b47a8a032 Fix for boost not shows the final boost
Fixes #950
2020-10-10 21:24:44 +02:00
montlikadani
5abfc0bb55 Now "jobs.petpay" can be denied to do not get income for killing mobs with mypet
Fixes #951
2020-10-10 21:11:32 +02:00
montlikadani
ee21d95a43 Lowercase some method names in paymentData 2020-10-08 21:02:36 +02:00
Zrips
20594c3e91 Need to be cast into int 2020-10-08 21:06:32 +03:00
kikelkik
8aff873a5b fix for #940 (stripping logs are respected as block place actions) 2020-10-05 22:21:51 +02:00
montlikadani
c8bb020587 Bump jobs version 2020-10-04 20:06:58 +02:00
montlikadani
2c369c57db Trying to fix quests
Fixes #936
2020-10-04 10:34:50 +02:00
montlikadani
6be60c1309 Entity for Tameable should return the entity not the player
Player is not Tameable, lol
2020-10-03 11:46:36 +02:00
montlikadani
0cf52b6362 Allow minus value for petpay 2020-10-02 15:12:26 +02:00
montlikadani
d5905519df Fix for useAsWhitelist not works
Fixes #929
2020-10-02 13:13:04 +02:00
montlikadani
3032802fad Fix for checking if the object is mypet
Fixes #930
2020-10-02 12:14:09 +02:00
Zrips
4dbe966f12 ArrayList more efficient for memory usage 2020-09-29 13:08:01 +03:00
Zrips
b7d50720ad Cleanup 2020-09-29 12:39:19 +03:00
Zrips
ade5fcc4f1 JobsWorld by id more faster 2020-09-29 12:24:53 +03:00
montlikadani
499045c13c Update locales from Crowdin 2020-09-28 20:29:45 +02:00
montlikadani
ae53a1227b Add option to pay for each vtrade items
Closes #571
2020-09-28 19:40:17 +02:00
montlikadani
de21c1857a This never gets null 2020-09-28 18:40:16 +02:00
montlikadani
2f37a7398c Misc simplifications 2020-09-28 18:20:47 +02:00
Zrips
ba37c1b746 Compacting explore cache 2020-09-28 18:57:15 +03:00
Zrips
b70bd4d49b Adjusting permission requirements 2020-09-28 16:21:02 +03:00
Zrips
7715864301 Fixing issue with quest chance value being opposite 2020-09-28 16:20:28 +03:00
Zrips
497673f2dc Cumulative needs to be false by default. 2020-09-28 12:45:37 +03:00
Gadse
bfba8d571b Fix max jobs, respect negated permissions, add cumulative option 2020-09-26 11:29:26 +02:00
montlikadani
2bb9d44d95 No one uses old mythicmobs 2020-09-22 17:24:39 +02:00
montlikadani
c91f88858a Added wildStacker and stackMob support to pay for stacked entities
Closes #923
2020-09-21 17:42:20 +02:00
montlikadani
a85a54aa5d Add /jobs resetlimit all argument to reset limits for all players
Closes #637
2020-09-13 20:31:15 +02:00
montlikadani
2e3e86f10b Fix for shear action not works with near spawner option 2020-09-13 20:16:40 +02:00
montlikadani
02d8fa4053 Remove async operation from sql connection, it does not allows
Fixes #921
2020-09-13 19:57:44 +02:00
montlikadani
274bc6e561 Do connecting to database thread safe 2020-09-12 20:46:05 +02:00
montlikadani
78c6368c09 Fix for registered furnaces reassign value not increased
Fixes #903
2020-09-09 19:38:43 +02:00
montlikadani
54fde9353f Another fix for max jobs 2020-09-05 16:40:41 +02:00
montlikadani
6f69806bd1 Fix for maxjobs not working
Fixes #907
Fixes #909
Closes #910
2020-09-05 16:05:21 +02:00
montlikadani
9545af4dd6 Fix for combining 2 items in the same inventory
Fixes #904
2020-09-05 15:00:37 +02:00
montlikadani
fe66a49c56 cleanup 2020-09-05 14:23:48 +02:00
montlikadani
08e4893e81 Fix for TNTBreak action not works when entity type is not ender crystal
Fixes #912
2020-09-05 12:11:26 +02:00
montlikadani
e52e954843 Have some idiot who gives 99999... (lots of 9 numbers) 2020-08-31 20:08:56 +02:00
montlikadani
40ace4f946 Added more API methods to JobsExpGainEvent
Closes #902
2020-08-28 21:04:26 +02:00
montlikadani
11b6f8f140 Do not pay for piston protection
Fixes #900
2020-08-28 17:56:50 +02:00
montlikadani
f3151489be Update mythicmobs repo 2020-08-27 09:47:17 +02:00
montlikadani
e933bc3a84 Split boost times and add info about timed boosts 2020-08-26 22:06:05 +02:00
montlikadani
e560b9328f Fix for new stripped materials on 1.16.2 2020-08-26 19:15:52 +02:00
montlikadani
b776c5b4a8 Fix for duplicate keys for userids
executeUpdate -> execute

Fixes #898
2020-08-26 17:40:15 +02:00
montlikadani
96754de707 Update languages from Crowdin 2020-08-25 16:43:19 +02:00
montlikadani
126bc43e01 Fix build 2020-08-25 16:35:30 +02:00
Zrips
9b068c306c Lets recognize quests with multiple words 2020-08-25 17:21:33 +03:00
Zrips
dc85541107 Lets support Hex color codes in titles 2020-08-25 16:13:19 +03:00
Zrips
6dc5fb9ba1 Lets reload jobs limits on level up or level down 2020-08-25 14:51:14 +03:00
Zrips
9f33d3387e Correct numbering for gtop list 2020-08-25 14:34:53 +03:00
Zrips
2d2b6ccb60 We need to invert block list to properly process moved blocks bp 2020-08-25 12:59:21 +03:00
Zrips
0df98f0246 Correct command sorting order 2020-08-25 12:35:17 +03:00
montlikadani
283525e853 Trying to fix resetquest
- Fix for quest tabcomplete
2020-08-24 08:00:13 +02:00
montlikadani
4491966934 maxjobs is not a complexed placeholder
Fixes #894
2020-08-23 20:59:42 +02:00
montlikadani
958329778a Fix when the completed quests can be skipped
Fixes #863

- Added tab complete for skipquest
2020-08-23 20:34:53 +02:00
montlikadani
176eb70dd3 Fix for clickedInventory method not exists in 1.8 or oldest servers 2020-08-22 20:46:34 +02:00
montlikadani
94f4a46cd3 Some things 2020-08-22 20:40:25 +02:00
montlikadani
a1840098ba Lets add separate option for reassign smokers & blast furnace
Closes #545

- Document JobsPaymentEvent about deprecated methods
2020-08-18 19:08:43 +02:00
montlikadani
466b1ce704 Added option to pay when combining two items, like weapon or armor
Closes #887
2020-08-18 12:27:21 +02:00
montlikadani
57fef613d4 No 2020-08-14 11:48:20 +02:00
montlikadani
c01a56759a Initial support for 1.16.2
- Added option for block protection to allow continous break payment for ore generators

Closes #886
Closes #885
2020-08-13 17:06:26 +02:00
montlikadani
9a6d657c61 Lets try to update total players with full job name
- Fixes #876
2020-08-11 15:23:51 +02:00
montlikadani
9fdbc0588d Remove useless isEnabled thing from listeners 2020-08-10 19:49:55 +02:00
montlikadani
4bf49034b1 Fix exploit for berries and composter when sneaking
Fixes #875
2020-08-08 14:47:39 +02:00
montlikadani
b4f0744391 Fix SQLException when the desc limit started from -1
Fixes #871
2020-08-04 18:11:53 +02:00
montlikadani
6d21e14725 Try to fix SQLiteException when UNIQUE constraint failed for sqlite
Fixes #870
2020-08-02 18:53:36 +02:00
montlikadani
be6474e9ef Fix for new Placeholderapi 2020-07-29 10:50:01 +02:00
montlikadani
e234e6651f Update CMI library 2020-07-27 18:42:54 +02:00
montlikadani
699d6dd385 Another fix for boosts 2020-07-27 11:47:55 +02:00
montlikadani
47d4cd1258 Fix when the bonus not works correctly
https://github.com/Zrips/Jobs/issues/365#issuecomment-664134673
2020-07-27 11:19:08 +02:00
montlikadani
ba9610618a Add %jobsr_user_jtoplvl_[jname/number]_[number]% placeholder
Closes #650
2020-07-26 19:34:02 +02:00
montlikadani
f61fbfeea8 Sump up boost permissions if we have more boosts in one job
Closes #469
2020-07-25 18:33:27 +02:00
montlikadani
2a9c72ea7c Now you can use negative boosts
Fixes #365

- Locale files now accepts hex colors
2020-07-25 13:40:17 +02:00
montlikadani
0a6a2648c8 Fixed issue when the points are not loaded on join
Fixes #848
2020-07-14 19:38:33 +02:00
montlikadani
dcbe4f706a Jobs commands now works when level from or level until not specified
Closes #826
2020-07-14 08:56:13 +02:00
montlikadani
3fceed1beb Add \n newline support for jobs description 2020-07-14 08:22:12 +02:00
Joaquim Neto
92cbf5c9ad
Add %jobsr_user_title_[jname/number]% placeholder (#856) 2020-07-13 21:49:50 +02:00
montlikadani
22f3f61bfc Fix version checking
- Fix when the money/exp/points displayed more values than original. This was caused by boosted items even its not exists.
  - Fixes #851
2020-07-09 19:08:04 +02:00
Zrips
adce7558d2 McMMO fishing treasure support 2020-07-07 16:09:04 +03:00
montlikadani
41e3b30d67 Fix jobname 2020-07-07 14:44:27 +02:00
montlikadani
0b31783c84 Refactor recognizing materials to decrease the file size 2020-07-07 14:41:04 +02:00
Zrips
d151fbec0f Fix for itembonus when you have items without bonus 2020-07-07 15:27:20 +03:00
Zrips
7f485bbbc5 Fixing item bonus issue 2020-07-07 15:21:03 +03:00
montlikadani
f17dfc7c07 Also include endercrystal in edit commands 2020-07-07 13:37:05 +02:00
Zrips
d0616e873b New jobs.all.vipmaxlevel permission node 2020-07-07 14:26:22 +03:00
montlikadani
439665039b Now you can use ender crystal as killed entity
Closes #572
2020-07-07 13:18:22 +02:00
Zrips
071b70609d Compatibility with older servers 2020-07-07 14:04:23 +03:00
Zrips
e630aee35c Correct way to recognize material 2020-07-07 13:49:40 +03:00
Zrips
0a21c1308c Fixing McMMO skill issue 2020-07-07 13:11:19 +03:00
montlikadani
d30a02242d Updated language files from Crowdin 2020-07-06 15:29:01 +02:00
Zrips
2873a7fae6 Json message handle update 2020-07-06 15:58:29 +03:00
montlikadani
3c74349f69 Fix when points/money and exp displaying even payment method is disabled
Fixes #844
2020-07-05 13:58:14 +02:00
montlikadani
393cfac66f Add more pages to jobs browse
Closes #734
2020-07-05 13:17:11 +02:00
montlikadani
321c5e331a Add "%jobsr_user_points_fixed%" placeholder
Closes #843
2020-07-05 11:52:52 +02:00
montlikadani
eb978e6db8 Fix when opening browse from jobs info 2020-07-04 18:52:49 +02:00
montlikadani
ec9507e836 Now you can specify bold, italic... colors in jobs
- Fix for regeneration potion effect not works

Closes #823
2020-07-04 17:26:28 +02:00
montlikadani
6ec44a92cf Now you can add slot numbers to browse gui items
Closes #840
2020-07-04 16:43:10 +02:00
montlikadani
433f87f738 Update Words_fr.yml 2020-07-03 18:40:58 +02:00
montlikadani
6e9d7fbca2 Fix when boosted items amount not calculates the correct boosts from inventory 2020-07-02 16:40:30 +02:00
montlikadani
876d5f7af2 things 2020-07-02 15:28:39 +02:00
montlikadani
ad47d98889 Fix ArrayIndexOutOfBounds error when reading translatable_words file 2020-06-29 16:08:28 +02:00
montlikadani
ebe6db80a1 Add soul_speed enchantment 2020-06-29 13:29:37 +02:00
montlikadani
cb9e7e1e12 Fixup some materials 2020-06-29 13:24:17 +02:00
montlikadani
db82201051 Clean up
- Fix when points are not added to the player account, Fixes #833
2020-06-29 13:19:12 +02:00
Zrips
21fa78ee92 Updating for the 1.16 support and base color handling 2020-06-29 13:51:24 +03:00
montlikadani
20e54e805c Correctly handle schedulers on load
Fixes #835
2020-06-28 21:24:52 +02:00
montlikadani
c162f1a2be Correct some things 2020-06-27 13:30:04 +02:00
montlikadani
1c8316a4c1 Add 1.16 features 2020-06-27 13:21:25 +02:00
montlikadani
66a51df12b Fix issue when the actionbar not works on 1.16 versions 2020-06-25 11:55:18 +02:00
montlikadani
41b07c2f36 Fix startup issue on 1.16 servers
Fixes #829
2020-06-25 11:03:23 +02:00
montlikadani
523eecefc6 Fix when loading data for player 2020-06-24 09:43:00 +02:00
montlikadani
1e4b7aa002 Some fixes
- Fixed when crafting tipped arrows, it didn't work
- Fix when PayForEachCraft option not works
- Some null checks to prevent exceptions
- Trying to fix issue with editpoints
2020-06-24 09:27:17 +02:00
montlikadani
4d0e4be8dd Another fix when some inventory types are not exists
Fixes #825
2020-06-17 12:37:17 +02:00
montlikadani
9ae9de678b We don't need to delete jobs when inserting
Fixes #824
2020-06-17 11:54:24 +02:00
montlikadani
1a0d87c7b2 Code cleanup
- Now %jobsr_user_points% will display only 3 digits, Closes #761
- Fix when resetting quests for all jobs
2020-06-16 09:27:28 +02:00
montlikadani
ae2b04f565 Added option to open up the jobs browse actions when you performed jobs info command 2020-06-14 21:11:21 +02:00
montlikadani
a897c43a5c Comment left behind 2020-06-14 13:30:10 +02:00
montlikadani
4d173e0623 Add ability to prevent crop resize payment when we places more cactus 2020-06-14 13:28:41 +02:00
montlikadani
b5c1516177 Fix error when grindstone and stonecutter inventories not exists in old versions
Fixes #819
2020-06-14 12:56:52 +02:00
montlikadani
daf56cd235
Delete messages_pt_BR.yml 2020-06-12 09:07:50 +02:00
montlikadani
6629971569 Updated locales 2020-06-12 09:06:40 +02:00
montlikadani
8644910fef Fixed when the db cleaning for users not works
Fixes #814
2020-06-12 08:56:15 +02:00
montlikadani
ea70a33342 Fix for bonus not adds the correct amount of boot
Fixes #600
2020-06-11 10:09:15 +02:00
montlikadani
42ce58e650 Remove this thing 2020-06-11 10:01:06 +02:00
montlikadani
d61d2b0b6e Fix for oregenerator plugins global timer not works
Fixes #793
2020-06-11 09:42:38 +02:00
montlikadani
b56a99526f Fixed issue when some enchantments are merged into another one
Fixes #816
2020-06-10 15:10:13 +02:00