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 |
|
dniym
|
c438a8718f
|
Merge pull request #5 from TheBusyBiscuit/master
adding PR
|
2020-07-07 06:26:38 -04:00 |
|
TheBusyBiscuit
|
0984afb3c6
|
Post-PR refactoring
|
2020-07-07 10:54:32 +02:00 |
|
TheBusyBiscuit
|
f304406aa8
|
[CI skip] Merge pull request #2071 from dniym/ChanceDrop
Added Chance Drop for MOB_DROP recipe items. References #980
|
2020-07-07 10:28:51 +02:00 |
|
dniym
|
367dd8c914
|
Negated isDroppedFromGolems
|
2020-07-06 22:28:41 -04:00 |
|
dniym
|
d122452c3b
|
Merge pull request #4 from TheBusyBiscuit/master
merging updates
|
2020-07-06 19:42:57 -04:00 |
|
dniym
|
371b283d21
|
Replaced Tabs with Spaces as requested
|
2020-07-06 19:19:13 -04:00 |
|
TheBusyBiscuit
|
5e54cd9ec5
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-07-06 22:04:45 +02:00 |
|
TheBusyBiscuit
|
afd63a1f51
|
Small performance optimization for large Cargo networks
|
2020-07-06 22:04:32 +02:00 |
|
LinoxGH
|
ca2c068e7a
|
Merge branch 'experimental' into IcePick
|
2020-07-06 20:13:18 +03:00 |
|
dniym
|
43b48b4b3d
|
Made Requested Changes
|
2020-07-05 16:54:27 -04:00 |
|
dniym
|
96b4394d7f
|
Made requested changes
|
2020-07-05 16:45:08 -04:00 |
|
TheBusyBiscuit
|
32d2259b9e
|
[CI skip] Merge pull request #2074 from TheBusyBiscuit/gitlocalize-12300
Minor translation changes in Japanese recipes.yml.
|
2020-07-05 20:51:59 +02:00 |
|
bito-blosh
|
0c0e45a34b
|
Translate recipes_ja.yml via GitLocalize
|
2020-07-05 16:46:45 +00:00 |
|
dniym
|
b3f801d84e
|
Made requested changes
|
2020-07-05 12:35:40 -04:00 |
|
TheBusyBiscuit
|
613dc7b328
|
Merge branch 'master' into experimental
|
2020-07-05 16:54:06 +02:00 |
|
dniym
|
645d73d0ef
|
Made requested changes.
|
2020-07-05 10:40:07 -04:00 |
|
TheBusyBiscuit
|
b243f128de
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-07-05 15:07:32 +02:00 |
|
TheBusyBiscuit
|
098304a1c4
|
Implemented a texture cache for contributors
|
2020-07-05 15:07:28 +02:00 |
|
TheBusyBiscuit
|
ee7fb23891
|
Merge pull request #2073 from TheBusyBiscuit/gitlocalize-12298
Added indonesian translations
|
2020-07-05 14:49:41 +02:00 |
|
TheBusyBiscuit
|
3408fcf11f
|
Updated assets
|
2020-07-05 14:39:28 +02:00 |
|
aril3721
|
1126a49e82
|
Translate messages_id.yml via GitLocalize
|
2020-07-05 12:36:23 +00:00 |
|
Dicky Ramadhoni
|
bf2bec04a5
|
Translate messages_id.yml via GitLocalize
|
2020-07-05 12:36:21 +00:00 |
|
EnderWingZ
|
ceb8af5e58
|
Translate messages_id.yml via GitLocalize
|
2020-07-05 12:36:19 +00:00 |
|
JunederZ
|
e7973ce95c
|
Translate researches_id.yml via GitLocalize
|
2020-07-05 12:36:16 +00:00 |
|
Dicky Ramadhoni
|
3e4969cc2f
|
Translate researches_id.yml via GitLocalize
|
2020-07-05 12:36:15 +00:00 |
|