mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
3,838 Commits 1 Branch 0 Tags 64 MiB
ba4282c3e7
Commit Graph

3838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBusyBiscuit
3661c05d2a Trying this out 2020-05-09 18:52:35 +02:00
TheBusyBiscuit
c019ac8289 Testing to see if this works 2020-05-09 18:42:58 +02:00
TheBusyBiscuit
1646d7c82d Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into tests

Conflicts:
	src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java
 2020-05-09 18:24:11 +02:00
TheBusyBiscuit
b908336cfc Updated pom.xml 2020-05-09 18:22:50 +02:00
TheBusyBiscuit
da95bb832d Fixes #1891 (actually fixed in a commit before the issue was posted) 2020-05-09 18:10:04 +02:00
TheBusyBiscuit
c93c6cfa68 Small refactoring 2020-05-09 18:00:10 +02:00
TheBusyBiscuit
74c40d5ad0
Merge pull request #1890 from jackychay/master fixes #1851 
Fixes Prismarine Brick duplication with Grind Stone #1851
 2020-05-09 16:13:46 +02:00
jacky
d806837000 Fixes Prismarine Brick duplication bug with Grind Stone #1851 2020-05-09 22:04:27 +08:00
jacky
e329560d6d Revert "Fixes Prismarine Brick duplication bug with Grind Stone #1829" 
This reverts commit cd0baa30
 2020-05-09 22:04:07 +08:00
jacky
cd0baa307e Fixes Prismarine Brick duplication bug with Grind Stone #1829 2020-05-09 21:22:25 +08:00
TheBusyBiscuit
dd159184a4 Refined pom.xml 2020-05-09 11:20:47 +02:00
TheBusyBiscuit
0e6ce77fd8 Deprecated these methods again 2020-05-09 10:51:55 +02:00
TheBusyBiscuit
cf777126ba [CI skip] Deprecated two methods because the Research class will move 2020-05-09 10:48:02 +02:00
TheBusyBiscuit
922444c046 Added new api method for researches 2020-05-09 10:41:36 +02:00
TheBusyBiscuit
c4026966a2 Removed api method 2020-05-09 10:35:21 +02:00
TheBusyBiscuit
f598089826 Fixed Multiblocks tests 2020-05-09 10:24:19 +02:00
TheBusyBiscuit
d8c06a2270 Updated repository names 2020-05-09 10:17:04 +02:00
TheBusyBiscuit
b30190da5c Refactoring 2020-05-08 23:05:29 +02:00
TheBusyBiscuit
5360e4d085 MOOORE Unit Tests 2020-05-08 22:09:08 +02:00
TheBusyBiscuit
974657fadc Fixed some unit tests 2020-05-08 21:26:18 +02:00
TheBusyBiscuit
cc21fb8fe3 Removed temporary migration method 2020-05-08 19:21:49 +02:00
TheBusyBiscuit
a37fe6d62a disabledItems now also uses the Worlds UUID 2020-05-08 19:07:06 +02:00
TheBusyBiscuit
ebf6725d7e Prevent World Settings from saving inside tests 2020-05-08 19:05:03 +02:00
TheBusyBiscuit
eb321e9ee5 Lots more refactoring 2020-05-08 18:59:51 +02:00
TheBusyBiscuit
dc137d04bf Player Profiles are now truly asynchronous 2020-05-08 18:47:25 +02:00
TheBusyBiscuit
643f992532 Removed deprecated test 2020-05-08 17:59:58 +02:00
TheBusyBiscuit
a4ebd663d5 Refactoring and Research Unit tests 2020-05-08 17:55:48 +02:00
TheBusyBiscuit
aa897a5de7 More tests and relocated a class 2020-05-08 17:13:16 +02:00
TheBusyBiscuit
a2512ce03a Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into tests 2020-05-08 16:00:31 +02:00
TheBusyBiscuit
c3dbe8f34a Maybe fixed the Electric Smeltery recipe priorities 2020-05-08 15:54:14 +02:00
TheBusyBiscuit
66ac945b5f No such thing as too many Unit Tests 2020-05-08 15:44:12 +02:00
TheBusyBiscuit
a68f2503cb Updated pom.xml 2020-05-07 20:51:00 +02:00
TheBusyBiscuit
a3afe615b5 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into tests 2020-05-07 20:39:42 +02:00
TheBusyBiscuit
528edc80d0 Fixes #1873 2020-05-07 20:38:51 +02:00
TheBusyBiscuit
de1af960bb [CI skip] Updated translator list 2020-05-07 20:35:03 +02:00
TheBusyBiscuit
51708d1eb1
[CI skip] Merge pull request #1887 from TheBusyBiscuit/gitlocalize-11632 
Added bulgarian categories
 2020-05-07 20:34:47 +02:00
TheBusyBiscuit
ea7d87a584
[CI skip] Merge pull request #1886 from TheBusyBiscuit/gitlocalize-11631 
Added macedonian recipes
 2020-05-07 20:34:22 +02:00
TheBusyBiscuit
2d3cfaee73 Updated PerWorldSettings 2020-05-07 20:32:37 +02:00
DNBGlol
97b352b4bc Translate categories_bg.yml via GitLocalize 2020-05-07 18:29:47 +00:00
Silent
0db56b4e7c Translate recipes_mk.yml via GitLocalize 2020-05-07 18:29:28 +00:00
TheBusyBiscuit
9e63f1ce79 Added Unit Tests for Categories 2020-05-07 19:56:45 +02:00
TheBusyBiscuit
220d5ef41f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into tests

Conflicts:
	CHANGELOG.md
 2020-05-07 18:18:09 +02:00
TheBusyBiscuit
0b416c3201 More tests 2020-05-07 18:00:44 +02:00
TheBusyBiscuit
41b0356bbc Refactoring 2020-05-07 18:00:30 +02:00
TheBusyBiscuit
8ad75b3f53
[CI skip] Merge pull request #1882 from TheBusyBiscuit/gitlocalize-11625 
messages_es
 2020-05-07 17:35:09 +02:00
Luu7
8d26c83304 Translate messages_es.yml via GitLocalize 2020-05-07 15:34:48 +00:00
TheBusyBiscuit
8577b9ef50 Added Unit Tests for ItemSetting<T> 2020-05-07 17:12:31 +02:00
TheBusyBiscuit
7e04566393 Further unit tests and jacoco coverage reports 2020-05-07 14:28:54 +02:00
TheBusyBiscuit
2037e65588
[CI skip] Merge pull request #1881 from TheBusyBiscuit/gitlocalize-11617 
Slovak language  - messages
 2020-05-07 11:59:18 +02:00
TheBusyBiscuit
6cd8266107 Translate messages_sk.yml via GitLocalize 2020-05-07 09:58:22 +00:00