Commit Graph

6383 Commits

Author SHA1 Message Date
b7dd491c01 Prevent nesting of bleed damage
This commit prevents the nesting of damage event processing in general in
regards to bleed, health related stuff will need a further glance over down
the line, however; This will fix a major problematic area
2019-11-13 19:53:02 +00:00
3ce0d7b972 dev mode 2019-11-10 19:51:47 -08:00
9dcbccb010 Merge pull request #4078 from Ineusia/master
Missing Section Error Messages (Repair & Salvage Config)
2019-11-10 18:18:12 -08:00
c5cbab39b6 Update RepairConfig.java
Removed accidental whitespace
2019-11-10 11:56:32 -06:00
ca1906fbc5 Added error message for missing Salvageables section (rather than throw NPE) 2019-11-08 01:15:32 -06:00
7eab20ef56 Added error message for missing Repairables section (rather than throw NPE) 2019-11-08 01:11:29 -06:00
188b0f9813 2.1.110 2019-10-18 15:48:53 -07:00
e6c9cc6fdd Actually fixed BlockCracker + One more type of block can be cracked 2019-10-18 15:48:12 -07:00
76ca7cc88f Additional dupe failsafes 2019-10-18 15:37:36 -07:00
335d708848 Bump version 2019-10-18 15:24:46 -07:00
b4179cb9a6 Fixed a dupe bug 2019-10-18 15:23:15 -07:00
8bbf95e9da Merge pull request #4065 from Vyciokazz/master
locale_lt_LT.properties
2019-10-18 01:10:09 -07:00
dc805825de 2.1.109 2019-10-17 20:16:01 -07:00
871ca744d9 Merge pull request #4070 from Fabrimat/patch-4
Update locale_it.properties
2019-10-17 10:01:26 -07:00
1b091bdbd5 Update locale_it.properties
Fixed definetly /mctop and fixed special characters.
2019-10-17 13:37:00 +02:00
f8a14a7ab3 Merge remote-tracking branch 'origin/configurable' into api 2019-10-09 21:54:48 +01:00
eee09d8d76 [WIP] Start breakout of mcmmo plugin
This commit starts work on the seperation of mcmmo and platform logic,
there is still a fair amount of work to go before this will compile,
down the line (potentially much further), bukkit logic will be stripped
out of -core
2019-10-09 21:53:04 +01:00
31dc7bf03f Update build.gradle.kts 2019-10-09 12:46:04 -07:00
1fbcf698c6 Merge branch 'configurable' into api 2019-10-06 01:34:55 +01:00
7be849da2a Fix compilation warnings 2019-10-06 01:16:27 +01:00
b572494c9c Remove the other deprecated PlayerProfile constructor 2019-10-06 01:07:01 +01:00
143714c9eb Remove deprecated PlayerProfile constructor 2019-10-06 01:03:07 +01:00
a84a9e9c38 Create api module, McMMOPlayer -> BukkitMMOPlayer 2019-10-05 02:55:03 +01:00
110d9a633b Update FUNDING.yml 2019-10-02 13:26:34 -07:00
584859318b Create FUNDING.yml 2019-10-02 13:06:56 -07:00
1eb2c7b2d7 Merge pull request #4068 from ethernetcat/master
Update locale_ja_JP.properties
2019-10-01 14:37:21 -04:00
3310a12a95 Update locale_ja_JP.properties 2019-10-02 01:43:51 +09:00
d2028321d4 Fixing SuperAbility strings 2019-09-30 16:11:06 -07:00
4437f419cb Fix our TamingSummon serializer 2019-09-30 15:44:22 -07:00
a58d875d74 Cleaning up more runtime errors during load 2019-09-30 15:28:51 -07:00
154d0a8d50 Completely disable all Repair code pending rewrite
Repair code will be handled in a sep branch, this is being done so the
configurable branch can compile and be semi-playable for testing
important in development features.
2019-09-30 15:10:59 -07:00
9e01a07542 Removing the hocon package 2019-09-30 14:34:38 -07:00
f13364eb04 You missed some stuff catboy :) 2019-09-30 14:18:59 -07:00
b763a56d75 Ignore bash scripts + Update Changelog 2019-09-30 13:59:38 -07:00
c7d2631a79 Add maven central repo 2019-09-30 21:37:33 +01:00
0cea66a084 Set version back to 2.2.0-SNAPSHOT 2019-09-30 21:26:30 +01:00
15913c8cf0 Drop maven pom 2019-09-30 21:24:05 +01:00
ba5c24fa3c Merge branch 'configurable' into gradlelize 2019-09-30 21:18:56 +01:00
f53d4bde67 invoke shadowJar 2019-09-30 21:08:02 +01:00
83373275f7 Move mcmmo into submodule
Goal will be to slowly move out the bukkit* dependencies from -core,
but, we have our starting point
2019-09-30 20:55:35 +01:00
90897c9ae1 I'll probably end up rewriting these serializers 2019-09-28 17:58:02 -07:00
7385679ec5 Initialize SkillTools before DST 2019-09-28 17:21:46 -07:00
075ccbf4da Add missing ConfigSerializable annotation 2019-09-28 17:16:13 -07:00
8a4318ee1f Load locale manager after config manager 2019-09-28 17:14:28 -07:00
8e1f002808 WG Manager now lives in WG Utils class, fixing the runtime errors for WG
hooks in mcMMO during start up
2019-09-28 16:50:55 -07:00
3700128b21 move locale files into their intended resource folder 2019-09-28 10:02:46 +01:00
c44ca47bfe Setup resource filtering
Also mark gradlew as executable
2019-09-28 09:43:33 +01:00
6125b3fbd2 Don't spam incompatible WG error 2019-09-27 18:57:25 +01:00
2ee102b44f Migrate the project to use Gradle. Reproduces a build almost exactly as the maven shade, only changed version numbers for comparison.
Signed-off-by: Gabriel Harris-Rouquette <gabizou@me.com>
2019-09-26 10:05:42 -07:00
c0bfdd34b7 And it compiles again! 2019-09-26 08:50:58 +01:00