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
4,005 Commits 1 Branch 0 Tags 64 MiB
a363cd1f5f
Commit Graph

4005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBusyBiscuit
7d82bfe35d
[CI skip] Merge pull request #2101 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x 
Update dependency org.mockito:mockito-core to v3.4.4
 2020-07-18 22:18:12 +02:00
Renovate Bot
88b24dc4ec
Update dependency org.mockito:mockito-core to v3.4.4 2020-07-18 19:51:01 +00:00
TheBusyBiscuit
41e52b5285
[CI skip] Merge pull request #2095 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x 
Update dependency org.mockito:mockito-core to v3.4.3
 2020-07-17 14:48:18 +02:00
Renovate Bot
b75deaf02e
Update dependency org.mockito:mockito-core to v3.4.3 2020-07-17 12:45:02 +00:00
TheBusyBiscuit
c78e3c3959 Performance improvements for cargo (when ChestTerminals is installed) 2020-07-16 22:41:36 +02:00
TheBusyBiscuit
a42c62dd04 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-16 21:53:26 +02:00
TheBusyBiscuit
ae5e97a81b
[CI skip] Merge pull request #2094 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x 
Update dependency org.mockito:mockito-core to v3.4.2
 2020-07-16 21:53:05 +02:00
Renovate Bot
7dd13ec57e
Update dependency org.mockito:mockito-core to v3.4.2 2020-07-16 19:47:31 +00:00
Daniel Walsh
b59c53c2e6 Fix long outstanding prefix bug 2020-07-16 19:55:16 +01:00
TheBusyBiscuit
75ca7f1d4b Cargo performance improvement 2020-07-15 23:49:44 +02:00
TheBusyBiscuit
52efb03305 Relocated a class 2020-07-15 19:52:29 +02:00
TheBusyBiscuit
3455c70d58 More refactoring 2020-07-15 19:19:38 +02:00
TheBusyBiscuit
52dd7e9705 Refactoring 2020-07-15 18:50:26 +02:00
TheBusyBiscuit
d26eed4534 Removed redundant check 2020-07-15 18:46:17 +02:00
TheBusyBiscuit
72e1cc33bb Minor change 2020-07-15 18:23:57 +02:00
TheBusyBiscuit
eaaf0c5c01 Another performance improvement to Energy networks 2020-07-15 18:23:21 +02:00
TheBusyBiscuit
f14ec8dc99 Missed one line 2020-07-15 13:20:47 +02:00
TheBusyBiscuit
45c01df9dc Updated to latest Spigot API methods 2020-07-15 13:19:51 +02:00
TheBusyBiscuit
c574337318 Reworked Energy Providers (Generators) 2020-07-15 13:17:27 +02:00
TheBusyBiscuit
0735eaad83 [CI skip] Removed more deprecated code 2020-07-14 13:19:04 +02:00
TheBusyBiscuit
61a56c1ee4
Fixed change log (again) 2020-07-13 17:01:24 +02:00
TheBusyBiscuit
cf89ee1f6f
Fixed change log 2020-07-13 17:00:21 +02:00
TheBusyBiscuit
50c579b7d6 Added a Tape Measure to the experimental branch 2020-07-13 11:55:59 +02:00
TheBusyBiscuit
f5db4bf695 Merge branch 'master' 2020-07-13 10:42:47 +02:00
TheBusyBiscuit
d4a1501523 Merge branch 'experimental' of 
https://github.com/TheBusyBiscuit/Slimefun4 into experimental

Conflicts:
	CHANGELOG.md
 2020-07-13 10:42:15 +02:00
TheBusyBiscuit
5c159b4247 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	CHANGELOG.md
	src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java
 2020-07-13 10:41:53 +02:00
TheBusyBiscuit
0f7318a749 [CI skip] Removed deprecated classes 2020-07-13 10:36:16 +02:00
TheBusyBiscuit
2b01c37e64
[CI skip] Merge pull request #2090 from TheBusyBiscuit/gitlocalize-12355 
Updated polish translations
 2020-07-13 10:34:57 +02:00
koloksk
28b44f8dd8 Translate categories_pl.yml via GitLocalize 2020-07-13 08:32:18 +00:00
Wirusiu
8c1c72cafd Translate messages_pl.yml via GitLocalize 2020-07-13 08:32:17 +00:00
mt-gitlocalize
b82dbd2d01 Translate researches_pl.yml via GitLocalize 2020-07-13 08:32:16 +00:00
kbartek05
65b86704d0 Translate researches_pl.yml via GitLocalize 2020-07-13 08:32:14 +00:00
Wirusiu
5ccf0faedf Translate researches_pl.yml via GitLocalize 2020-07-13 08:32:12 +00:00
TheBusyBiscuit
0462a8b441
[CI skip] Merge pull request #2089 from TheBusyBiscuit/gitlocalize-12354 
Updated indonesian Category translations
 2020-07-13 10:17:52 +02:00
Nathan Adhitya
a342aaa1cc Translate categories_id.yml via GitLocalize 2020-07-13 08:16:08 +00:00
TheBusyBiscuit
cd0882e484
[CI skip] Merge pull request #2087 from TheBusyBiscuit/gitlocalize-12345 
Filipino/Tagalog Translation
 2020-07-13 10:12:28 +02:00
Scott Gomez Andoy
8dbb2cf2fb Translate researches_tl.yml via GitLocalize 2020-07-12 14:09:00 +00:00
TheBusyBiscuit
9af908300f Fixed a NullPointerException for Error-Reports for generators 2020-07-12 13:19:16 +02:00
TheBusyBiscuit
3fd6e88ffe
[CI skip] Merge pull request #2085 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x 
Update dependency org.mockito:mockito-core to v3.4.0
 2020-07-12 13:16:35 +02:00
Renovate Bot
767e9001a4
Update dependency org.mockito:mockito-core to v3.4.0 2020-07-10 20:05:27 +00:00
TheBusyBiscuit
058f34879a Moved the Soulbound Backpack to "Magical Gadgets" 2020-07-10 18:02:51 +02:00
TheBusyBiscuit
f93117ffa3
[CI skip] Set release date for RC-14 2020-07-10 16:49:09 +02:00
TheBusyBiscuit
8fd0afd8bd Fixes #2081 2020-07-09 18:35:48 +02:00
TheBusyBiscuit
6d3e4ca96b Added a missing annotation 2020-07-09 13:59:16 +02:00
TheBusyBiscuit
4dcc73bbf8 Fixed javadocs 2020-07-09 13:58:04 +02:00
TheBusyBiscuit
c9c760836e Another class relocation 2020-07-09 12:43:26 +02:00
TheBusyBiscuit
d677c29298
Merge branch 'master' into experimental 2020-07-08 13:34:27 +02:00
TheBusyBiscuit
c2b0121a07 More refactoring 2020-07-08 13:32:19 +02:00
TheBusyBiscuit
c516cab263 Some refactoring and small optimizations 2020-07-08 11:26:44 +02:00
TheBusyBiscuit
0984afb3c6 Post-PR refactoring 2020-07-07 10:54:32 +02:00