EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-04 02:53:43 +01:00
Code Issues Projects Releases Wiki Activity
5,563 Commits 48 Branches 45 Tags
1f734582d4a69f8577e01b0f2af58e5bc01a701e
Commit Graph

1102 Commits

Author SHA1 Message Date
nossr50
2ef10afce3 Merge branch 'master' of https://github.com/mcMMO-dev/mcmmo into configurable 
# Conflicts:
#	Changelog.txt
#	pom.xml
#	src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
 2019-04-09 17:49:56 -07:00
nossr50
f1204f8a2a 2.1.39 - Added Seagrass/Tall_Seagrass to experience tables 
Salvage should sound a bit different to Repair now
Fixes #3863 #3862
 2019-04-09 16:34:38 -07:00
nossr50
737b95d538 Merge branch 'master' of https://github.com/mcMMO-dev/mcmmo into configurable 2019-04-07 18:31:59 -07:00
FabioZumbi12
974106f983 Update locale_pt_BR.properties 2019-04-07 04:03:08 -03:00
nossr50
abda53641f Merging 2019-04-06 06:10:52 -07:00
András Marczinkó
2fca0963d7 Update locale_hu_HU.properties 
Improve AbilityGateRequirementFail translation.
Translated new translation lines.
Update and fix Guides.Mining.Section.4
 2019-04-05 10:44:01 +02:00
nossr50
4068d61246 Merge master 2019-04-04 19:20:24 -07:00
nossr50
8538ac4e50 mcnotify will now squelch notifications from mcMMO & players who are squelched will be reminded of their squelch status at least once an hour (you can disable this in advanced.yml) 2019-04-04 17:27:17 -07:00
OverCrave
43dd382541 fix concoction name inconsistency 2019-04-04 13:12:55 +02:00
OverCrave
cdb81e961e fix herbalism name inconsistency 2019-04-04 13:11:24 +02:00
OverCrave
51ced83301 mining guide update 2019-04-04 13:09:57 +02:00
OverCrave
09bca96af3 Merge remote-tracking branch 'upstream/master' 2019-04-04 13:05:37 +02:00
nossr50
f1d9f787f4 2.1.35 2019-04-04 00:39:00 -07:00
nossr50
6cad982969 Merge conflicts 2019-04-04 00:24:34 -07:00
nossr50
ac10261803 Blast Mining uses Pickaxe + Missing Taming XP entries 2019-04-03 21:54:49 -07:00
nossr50
8991c2bf2c Fixing merge conflicts 2019-04-03 17:25:18 -07:00
OverCrave
dc018be6bb overhaul part 2 
- fixed/changed punctuation and grammar in some of the skills
- fixed some skills commands not having the same name as their shown name
 2019-04-03 22:20:59 +02:00
OverCrave
832b653a88 change usage of word 'wahrscheinlichkeit/chance' for consistency 2019-04-03 21:50:38 +02:00
OverCrave
1fddaf15cc add last missing new translations 2019-04-03 21:49:16 +02:00
nossr50
f3837265db 2.1.33 2019-04-02 23:03:48 -07:00
nossr50
09c91f3b4b 2.1.32 2019-04-01 16:22:43 -07:00
nossr50
0d3551c84b Adding missing Double Drop entries for Woodcutting 2019-04-01 16:06:16 -07:00
nossr50
dc4401ffb0 Add missing Herbalism entries to config 2019-04-01 16:04:30 -07:00
nossr50
9568c0f85c Fixing Mining Double Drops (update configs) 2019-04-01 16:04:29 -07:00
OverCrave
8182249641 Update locale_de.properties 2019-04-01 15:41:24 -07:00
OverCrave
b36c1376cf Update locale_de.properties 2019-04-01 15:38:37 -07:00
OverCrave
e4c911869d Update locale_de.properties 2019-04-01 15:38:37 -07:00
OverCrave
457b7f9d14 Update locale_de.properties 2019-04-01 15:38:36 -07:00
nossr50
ae551e17cd 2.1.32 2019-04-01 10:16:43 -07:00
OverCrave
d44b6e0afb readd other locales 2019-03-30 17:59:25 +01:00
OverCrave
629d882831 Merge remote-tracking branch 'upstream/master' 2019-03-30 17:57:14 +01:00
OverCrave
947018c0f1 remove other languages temporarily 2019-03-30 17:56:40 +01:00
nossr50
b7d33f0227 Adding missing Double Drop entries for Woodcutting 2019-03-29 18:11:32 -07:00
nossr50
28c7fdd4e2 Add missing Herbalism entries to config 2019-03-29 17:57:48 -07:00
nossr50
53534e0f1d Fixing Mining Double Drops (update configs) 2019-03-29 17:44:54 -07:00
nossr50
e232bb3699 finished default repairables, diamond armor gives less xp by default 2019-03-29 00:03:50 -07:00
nossr50
2cdb0395ee wire up alerting admins to over-fishing repeated abuse 2019-03-29 00:03:08 -07:00
nossr50
7d2e76e464 Super Ability config pt 2 2019-03-29 00:00:26 -07:00
nossr50
80df1dd4bd Wire up party config pt 4 2019-03-29 00:00:24 -07:00
nossr50
e57bf35e5e new settings for showing patreon, paypal 2019-03-29 00:00:19 -07:00
nossr50
bbe9b92c15 Refactoring mistake 2019-03-28 23:57:20 -07:00
nossr50
f00601931d Scoreboard config part 1 2019-03-28 23:57:20 -07:00
nossr50
1c289cfcdf Refactoring SQL config class names again 2019-03-28 23:57:19 -07:00
nossr50
88cd8e64bb Database Config getter boilerplate 2019-03-28 23:57:18 -07:00
nossr50
493d6b0a67 Starting the conversion to HOCON, splitting up configs, and more 2019-03-28 23:57:14 -07:00
nossr50
a2e0ca0f84 Flux Mining Cleanup 2019-03-28 23:54:47 -07:00
nossr50
f2945569fb Fixed zero initialize for SkullSplitter. config nodes 2019-03-28 23:47:26 -07:00
nossr50
35d1e1ebd9 Removing test files 2019-03-28 23:47:25 -07:00
nossr50
5647eebe99 Multiplier to camelcase 2019-03-28 23:47:20 -07:00
nossr50
bef86f0e97 add CustomName and Lore fields to default treasure configs 
the functionality for these keys has always been here but this change should help make it more obvious
 2019-03-28 23:46:42 -07:00