TheBusyBiscuit
|
a334387a07
|
[CI skip] Merge pull request #2048 from TheBusyBiscuit/gitlocalize-12222
Updated portuguese (BR) translations
|
2020-06-25 22:57:06 +02:00 |
|
TheBusyBiscuit
|
1520e71107
|
Updated translators
|
2020-06-25 22:51:56 +02:00 |
|
FaolanMalcadh
|
def404378d
|
Translate researches_pt-BR.yml via GitLocalize
|
2020-06-25 20:50:18 +00:00 |
|
krazybeat
|
2cc97398d0
|
Translate researches_pt-BR.yml via GitLocalize
|
2020-06-25 20:50:17 +00:00 |
|
FaolanMalcadh
|
514e6af7a6
|
Translate categories_pt-BR.yml via GitLocalize
|
2020-06-25 20:50:16 +00:00 |
|
LinoxGH
|
f54b277111
|
Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into EnchRune
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
src/main/resources/languages/researches_en.yml
|
2020-06-25 22:35:14 +03:00 |
|
LinoxGH
|
1a8ff9c511
|
Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into ExplosiveBowChange
|
2020-06-25 22:16:49 +03:00 |
|
LinoxGH
|
e016ea1180
|
Explosive Bow Functionality Changed.
Explosive Bow now deals an area of effect.
|
2020-06-25 22:13:24 +03:00 |
|
TheBusyBiscuit
|
b138b50d96
|
Merge pull request #2042 from TheBusyBiscuit/1.16
Added 1.16 support
|
2020-06-25 21:08:55 +02:00 |
|
TheBusyBiscuit
|
d18af0c211
|
Ore Crusher now also accepts Nether Gold Ore
|
2020-06-25 15:27:18 +02:00 |
|
TheBusyBiscuit
|
e66aa0baa5
|
Added Smithing Table Recipe support
|
2020-06-25 15:18:31 +02:00 |
|
TheBusyBiscuit
|
311202ce35
|
Another patch for 1.16 compatibility
|
2020-06-25 15:14:58 +02:00 |
|
TheBusyBiscuit
|
2ed8fdda12
|
Update README.md
|
2020-06-25 14:47:10 +02:00 |
|
TheBusyBiscuit
|
427a312240
|
More steps towards 1.16 compatibility (unfinished)
|
2020-06-25 14:43:17 +02:00 |
|
TheBusyBiscuit
|
8c11ff17e6
|
Merge pull request #2030 from WalshyDev/support/1.16
1.16 support
|
2020-06-25 13:46:35 +02:00 |
|
TheBusyBiscuit
|
fc8fdacd3f
|
Updated CS-CoreLIb2 version
|
2020-06-25 13:41:30 +02:00 |
|
TheBusyBiscuit
|
92e7e58915
|
Merge branch 'master' into support/1.16
|
2020-06-25 13:40:28 +02:00 |
|
TheBusyBiscuit
|
3b7ad0ac63
|
[CI skip] Merge pull request #2039 from LinoxGH/AutoDrierFix
Auto Drier 1.13 Update
|
2020-06-25 13:27:50 +02:00 |
|
LinoxGH
|
f9c8cd1d76
|
Fixed the recipe.
|
2020-06-25 14:08:57 +03:00 |
|
LinoxGH
|
82b9de4c54
|
Fixed merge conflict.
|
2020-06-25 13:38:30 +03:00 |
|
LinoxGH
|
7e20e7cd9f
|
Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into AutoDrierFix
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java
|
2020-06-25 13:37:33 +03:00 |
|
TheBusyBiscuit
|
ff205aee4e
|
Merge pull request #2027 from SoSeDiK/storage
Improve the handling of non-registered worlds
|
2020-06-25 12:12:08 +02:00 |
|
SoSeDiK
|
e52ac9d43b
|
Make it compile
|
2020-06-25 13:06:34 +03:00 |
|
SoSeDiK
|
386cbea53b
|
Whoops
|
2020-06-25 12:59:02 +03:00 |
|
SoSeDiK
|
ade18c7bd8
|
Remove unused import
|
2020-06-25 12:58:04 +03:00 |
|
SoSeDiK
|
4ed2258eb0
|
Replace stream with for loop
|
2020-06-25 12:49:18 +03:00 |
|
TheBusyBiscuit
|
3402f344b2
|
[CI skip] Merge pull request #2034 from TheBusyBiscuit/gitlocalize-12215
Turkish Translation Update Pt.4
|
2020-06-25 10:33:54 +02:00 |
|
TheBusyBiscuit
|
8e8dd55994
|
[CI skip] Merge pull request #2033 from TheBusyBiscuit/gitlocalize-12214
Turkish Translation Update Pt.3
|
2020-06-25 10:33:32 +02:00 |
|
TheBusyBiscuit
|
bfc1fac276
|
[CI skip] Merge pull request #2032 from TheBusyBiscuit/gitlocalize-12213
Turkish Translation Update Pt.2
|
2020-06-25 10:33:06 +02:00 |
|
TheBusyBiscuit
|
c1bce66bca
|
[CI skip] Merge pull request #2031 from TheBusyBiscuit/gitlocalize-12212
Turkish Translation Update Pt.1
|
2020-06-25 10:32:28 +02:00 |
|
TheBusyBiscuit
|
dab7baceaa
|
[CI skip] Merge pull request #2028 from TheBusyBiscuit/gitlocalize-12211
Filipino/Tagalog Translation Update
|
2020-06-25 10:31:53 +02:00 |
|
Daniel Walsh
|
120ece9646
|
Support 1.16 fully! :)
|
2020-06-25 09:31:50 +01:00 |
|
TheBusyBiscuit
|
75cfc05cdb
|
[CI skip] Merge pull request #2026 from TheBusyBiscuit/gitlocalize-12210
Update chinese translation to latest
|
2020-06-25 10:29:33 +02:00 |
|
TheBusyBiscuit
|
3aa4930e9f
|
[CI skip] Merge pull request #2025 from TheBusyBiscuit/gitlocalize-12207
researches_es
|
2020-06-25 10:28:43 +02:00 |
|
TheBusyBiscuit
|
116f18a90e
|
[CI skip] Merge pull request #2024 from TheBusyBiscuit/gitlocalize-12206
messages_es
|
2020-06-25 10:28:18 +02:00 |
|
LinoxGH
|
7a09253311
|
Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into ShulkerShell
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
src/main/resources/languages/researches_en.yml
|
2020-06-25 10:11:33 +03:00 |
|
LinoxGH
|
898294c4a2
|
Translate researches_tr.yml via GitLocalize
|
2020-06-25 06:08:57 +00:00 |
|
LinoxGH
|
7d250e58d6
|
Translate recipes_tr.yml via GitLocalize
|
2020-06-25 06:08:18 +00:00 |
|
LinoxGH
|
2cd81a2dbc
|
Translate messages_tr.yml via GitLocalize
|
2020-06-25 06:07:35 +00:00 |
|
LinoxGH
|
8ec118f88c
|
Translate categories_tr.yml via GitLocalize
|
2020-06-25 06:07:06 +00:00 |
|
Scott Gomez Andoy
|
d76e2fb752
|
Translate researches_tl.yml via GitLocalize
|
2020-06-25 05:57:06 +00:00 |
|
Scott Gomez Andoy
|
3ee151b069
|
Translate messages_tl.yml via GitLocalize
|
2020-06-25 05:51:05 +00:00 |
|
Daniel Walsh
|
81e16a6c47
|
1.16 support
|
2020-06-25 06:05:17 +01:00 |
|
mt-gitlocalize
|
c5e1b2aadf
|
Translate researches_tl.yml via GitLocalize
|
2020-06-25 04:45:21 +00:00 |
|
Scott Gomez Andoy
|
ea9b2e2494
|
Translate researches_tl.yml via GitLocalize
|
2020-06-25 04:45:20 +00:00 |
|
Scott Gomez Andoy
|
00a61a296f
|
Translate messages_tl.yml via GitLocalize
|
2020-06-25 04:45:19 +00:00 |
|
SoSeDiK
|
ecd97b3e50
|
Fixed a tiny typo
|
2020-06-25 05:54:21 +03:00 |
|
Nameless
|
9ade467249
|
Translate researches_zh-CN.yml via GitLocalize
|
2020-06-25 02:41:27 +00:00 |
|
Nameless
|
bb3650e9e7
|
Translate messages_zh-CN.yml via GitLocalize
|
2020-06-25 02:41:25 +00:00 |
|
SoSeDiK
|
c175596536
|
Improve the handling of non-registered worlds
|
2020-06-25 05:33:02 +03:00 |
|