mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 04:05:48 +00:00
Code Releases Activity
4,838 Commits 1 Branch 0 Tags 64 MiB
7814bdcdee
Commit Graph

906 Commits

Author SHA1 Message Date
TheBusyBiscuit
c56ebe9c23
Merge branch 'master' into IcePick 2020-08-04 19:12:00 +02:00
Scott Gomez Andoy
927eefd63c Translate recipes_tl.yml via GitLocalize 2020-08-04 12:46:42 +00:00
TheBusyBiscuit
736b48a799
Merge pull request #2188 from TheBusyBiscuit/gitlocalize-12525 
Added korean as a language
 2020-08-04 12:54:45 +02:00
TheBusyBiscuit
14f0b0f3fe
[CI skip] Merge pull request #2186 from TheBusyBiscuit/gitlocalize-12523 
Updated german translation
 2020-08-04 12:54:20 +02:00
kwonms871
b41ef97859 Translate messages_ko.yml via GitLocalize 2020-08-04 10:48:38 +00:00
LinoxGH
bdde1d9745 Translate recipes_tr.yml via GitLocalize 2020-08-04 10:45:39 +00:00
TheBusyBiscuit
c2443a4df2 Translate recipes_de.yml via GitLocalize 2020-08-04 10:44:15 +00:00
TheBusyBiscuit
e870f82afd Added piglin bartering to translation files 2020-08-04 12:40:08 +02:00
kudansul
f3191658b8 Translate researches_ko.yml via GitLocalize 2020-08-02 11:46:07 +00:00
TheBusyBiscuit
0f924e485b
[CI skip] Merge pull request #2159 from TheBusyBiscuit/gitlocalize-12482 
Categories_it
 2020-08-01 16:58:41 +02:00
prolletto64
bf3a0391d0 Translate categories_it.yml via GitLocalize 2020-07-31 13:43:17 +00:00
prolletto64
db424e0437 Translate researches_it.yml via GitLocalize 2020-07-31 13:41:59 +00:00
Scott Gomez Andoy
5d22bfb109 Translate recipes_tl.yml via GitLocalize 2020-07-30 23:59:34 +00:00
TheBusyBiscuit
90685edae6 Added a permission node for the debug fish 2020-07-31 01:32:43 +02:00
SoSeDiK
8ddb055083 Translate researches_ru.yml via GitLocalize 2020-07-30 11:45:13 +00:00
SoSeDiK
2999e777f9 Translate messages_ru.yml via GitLocalize 2020-07-30 11:45:09 +00:00
TheBusyBiscuit
771456b6cd [CI skip] Fixed some malformed yaml 2020-07-30 13:30:20 +02:00
TheBusyBiscuit
a363cd1f5f
[CI skip] Removed trailing-spaces from config 2020-07-30 13:24:56 +02:00
Nameless
08412f3c6c Translate researches_zh-CN.yml via GitLocalize 2020-07-28 01:16:18 +00:00
Nameless
641d24d48d Translate messages_zh-CN.yml via GitLocalize 2020-07-28 01:16:15 +00:00
TheBusyBiscuit
3573628621 Translate messages_hu.yml via GitLocalize 2020-07-26 23:00:23 +00:00
András Marczinkó
d01dadfa42 Translate researches_hu.yml via GitLocalize 2020-07-26 23:00:22 +00:00
bito-blosh
d1224b2d44 Translate resources_ja.yml via GitLocalize 2020-07-25 23:03:32 +00:00
bito-blosh
cb439b5aee Translate messages_ja.yml via GitLocalize 2020-07-25 23:03:31 +00:00
bito-blosh
9e317e8c4e Translate researches_ja.yml via GitLocalize 2020-07-25 23:03:30 +00:00
TheBusyBiscuit
c717c0e4ce
[CI skip] Merge pull request #2130 from TheBusyBiscuit/gitlocalize-12447 
Updated researches for chinese (Taiwan)
 2020-07-25 15:39:47 +02:00
LinoxGH
8844ec17d7 Translate researches_tr.yml via GitLocalize 2020-07-25 13:36:45 +00:00
LinoxGH
8230987cfc Translate messages_tr.yml via GitLocalize 2020-07-25 13:36:44 +00:00
HeroBrineKing
191c4ffa60 Translate researches_zh-TW.yml via GitLocalize 2020-07-25 13:33:44 +00:00
Scott Gomez Andoy
8792d8eace Translate researches_tl.yml via GitLocalize 2020-07-25 13:19:02 +00:00
Scott Gomez Andoy
9d1b307568 Translate messages_tl.yml via GitLocalize 2020-07-25 13:19:00 +00:00
MeerBiene
85d7cb0f69 Translate researches_de.yml via GitLocalize 2020-07-25 13:15:18 +00:00
TheBusyBiscuit
5b706ca6b3 Translate messages_de.yml via GitLocalize 2020-07-25 13:15:17 +00:00
TheBusyBiscuit
17cd55bf53
Merge pull request #2072 from TheBusyBiscuit/experimental 
Merge of "experimental" branch
 2020-07-25 15:07:47 +02:00
Scott Gomez Andoy
30e1a6ce0a Translate messages_tl.yml via GitLocalize 2020-07-25 12:41:27 +00:00
TheBusyBiscuit
92ca696140 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	CHANGELOG.md
 2020-07-25 14:27:12 +02:00
TheBusyBiscuit
20372f7e05
[CI skip] Merge pull request #2125 from TheBusyBiscuit/gitlocalize-12442 
Updated Ukrainian localizations
 2020-07-25 14:23:10 +02:00
TheBusyBiscuit
583a971c4f
[CI skip] Merge pull request #2124 from TheBusyBiscuit/gitlocalize-12441 
Updated Russian localizations
 2020-07-25 14:22:44 +02:00
TheBusyBiscuit
6374f09d29 Translate messages_de.yml via GitLocalize 2020-07-25 12:21:58 +00:00
SoSeDiK
77f5224d14 Translate messages_uk.yml via GitLocalize 2020-07-25 12:05:24 +00:00
SoSeDiK
c6db53205c Translate messages_ru.yml via GitLocalize 2020-07-25 12:04:24 +00:00
LinoxGH
b68227b7b8 Translate messages_tr.yml via GitLocalize 2020-07-25 12:03:34 +00:00
TheBusyBiscuit
ebce279cf2
Merge pull request #2121 from poma123/patch-2 fixes #2097 
Fixed piglin SlimefunItem pickup
 2020-07-25 13:56:58 +02:00
poma123
dde3ec26ba Requested changes 2020-07-25 13:51:10 +02:00
TheBusyBiscuit
33f7c42e2c Added an option to disable the "Ignoring duplicate block" message 2020-07-25 12:28:04 +02:00
LinoxGH
8481f0cde3
Merge branch 'experimental' into ShulkerShell 2020-07-24 19:42:12 +03:00
LinoxGH
3b17874ea2
Merge branch 'experimental' into IcePick 2020-07-24 19:39:59 +03:00
TheBusyBiscuit
499bbdbf70
Merge branch 'master' into experimental 2020-07-24 16:36:08 +02:00
András Marczinkó
6d74effbdf Translate resources_hu.yml via GitLocalize 2020-07-24 14:34:45 +00:00
András Marczinkó
3e5799391a Translate recipes_hu.yml via GitLocalize 2020-07-24 14:34:44 +00:00
András Marczinkó
b9fb1fe7bd Translate researches_hu.yml via GitLocalize 2020-07-24 14:34:42 +00:00
András Marczinkó
6cfc8b7bfc Translate categories_hu.yml via GitLocalize 2020-07-24 14:34:41 +00:00
TheBusyBiscuit
1f7b75b823 Added Iron Golem Assembler (experimental) 2020-07-23 12:02:53 +02:00
Daniel Walsh
55041e81b1 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into feature/metrics-module 2020-07-20 15:15:39 +01:00
Daniel Walsh
67db0ce59e Oh baby, this is a big one 2020-07-20 15:15:21 +01:00
TheBusyBiscuit
eb9466c41d Added a research for the Tape Measure (experimental) 2020-07-20 12:47:13 +02:00
Daniel Walsh
b59c53c2e6 Fix long outstanding prefix bug 2020-07-16 19:55:16 +01:00
TheBusyBiscuit
572d3dceec
Merge branch 'experimental' into ShulkerShell 2020-07-13 17:05:39 +02:00
TheBusyBiscuit
50c579b7d6 Added a Tape Measure to the experimental branch 2020-07-13 11:55:59 +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
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
Wirusiu
5ccf0faedf Translate researches_pl.yml via GitLocalize 2020-07-13 08:32:12 +00:00
Nathan Adhitya
a342aaa1cc Translate categories_id.yml via GitLocalize 2020-07-13 08:16:08 +00:00
Scott Gomez Andoy
8dbb2cf2fb Translate researches_tl.yml via GitLocalize 2020-07-12 14:09:00 +00:00
LinoxGH
ca2c068e7a
Merge branch 'experimental' into IcePick 2020-07-06 20:13:18 +03:00
bito-blosh
0c0e45a34b Translate recipes_ja.yml via GitLocalize 2020-07-05 16:46:45 +00:00
TheBusyBiscuit
613dc7b328
Merge branch 'master' into experimental 2020-07-05 16:54:06 +02:00
EnderWingZ
ceb8af5e58 Translate messages_id.yml via GitLocalize 2020-07-05 12:36:19 +00:00
Frozenkamui
fe6f61cce2 Translate researches_id.yml via GitLocalize 2020-07-05 12:36:11 +00:00
TheBusyBiscuit
6a950fe8d6 Fixed lore 2020-07-05 13:06:13 +02:00
TheBusyBiscuit
9426ebb2e9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java
 2020-07-05 12:08:30 +02:00
LinoxGH
bbcf1da3e2 Translate recipes_tr.yml via GitLocalize 2020-07-02 20:47:59 +00:00
Scott Gomez Andoy
424cf12b64 Translate messages_tl.yml via GitLocalize 2020-07-02 11:27:02 +00:00
Scott Gomez Andoy
144483178d Translate categories_tl.yml via GitLocalize 2020-07-02 11:27:01 +00:00
LinoxGH
12176a9ae7
Merge branch 'experimental' into IcePick 2020-06-30 13:09:02 +03:00
TheBusyBiscuit
30c87b2256
Merge pull request #2046 from LinoxGH/EnchRune 
Enchantment Rune
 2020-06-30 01:23:20 +02:00
LinoxGH
833b2d3943 Did another requested change. 2020-06-29 01:11:01 +03:00
LinoxGH
e55e2690e7 Did the requested changes. 2020-06-28 22:06:35 +03:00
LinoxGH
005d4c04cc Did the requested changes. 2020-06-28 18:53:12 +03:00
LinoxGH
073fe1322b Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into IcePick 
 Conflicts:
	src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java
 2020-06-28 14:42:34 +03:00
TheBusyBiscuit
3dc043c857 Refactoring: Relocated Plugin class 2020-06-27 13:10:47 +02:00
Vravinite
c941b9080f Translate recipes_es.yml via GitLocalize 2020-06-26 21:53:21 +00:00
HeroBrineKing
758e687783 Translate messages_zh-TW.yml via GitLocalize 2020-06-26 21:51:20 +00:00
HeroBrineKing
3ba284746b Translate researches_zh-TW.yml via GitLocalize 2020-06-26 21:51:18 +00:00
HeroBrineKing
6b89cd3fc2 Translate recipes_zh-TW.yml via GitLocalize 2020-06-26 21:51:17 +00:00
HeroBrineKing
dab48cbe13 Translate categories_zh-TW.yml via GitLocalize 2020-06-26 21:51:16 +00:00
LinoxGH
207cb35dda Added Climbing Pick 2020-06-26 22:03:17 +03:00
LinoxGH
9176d795c8 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into EnchRune 2020-06-26 13:28:45 +03:00
SoSeDiK
6ab2b34a83 Translate researches_uk.yml via GitLocalize 2020-06-26 08:53:56 +00:00
SoSeDiK
ca73b4a891 Translate recipes_uk.yml via GitLocalize 2020-06-26 08:53:54 +00:00
SoSeDiK
1e6ac71bef Translate messages_uk.yml via GitLocalize 2020-06-26 08:53:53 +00:00
TheBusyBiscuit
05740b4459
[CI skip] Merge pull request #2051 from TheBusyBiscuit/gitlocalize-12226 
Updated Russian messages
 2020-06-26 10:43:43 +02:00
TheBusyBiscuit
2b1acfd121
[CI skip] Merge pull request #2052 from TheBusyBiscuit/gitlocalize-12227 
Updated Russian researches
 2020-06-26 10:41:29 +02:00
SoSeDiK
5d283c053d Translate recipes_ru.yml via GitLocalize 2020-06-26 08:38:51 +00:00
SoSeDiK
1b159091a0 Translate researches_ru.yml via GitLocalize 2020-06-26 08:38:41 +00:00
SoSeDiK
e358289c4b Translate messages_ru.yml via GitLocalize 2020-06-26 08:38:32 +00:00
TheBusyBiscuit
df8ae5738d
[CI skip] Merge pull request #2050 from TheBusyBiscuit/gitlocalize-12224 
Update recipes_zh-CN.yml
 2020-06-26 10:34:58 +02:00
Nameless
682dcf1189 Translate recipes_zh-CN.yml via GitLocalize 2020-06-26 04:57:58 +00:00
Scott Gomez Andoy
526c2e5228 Translate recipes_tl.yml via GitLocalize 2020-06-25 23:36:17 +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
TheBusyBiscuit
e66aa0baa5 Added Smithing Table Recipe support 2020-06-25 15:18:31 +02: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
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
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
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
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
Vravinite
813e72b5b4 Translate researches_es.yml via GitLocalize 2020-06-25 02:10:20 +00:00
Luu7
6276029aec Translate messages_es.yml via GitLocalize 2020-06-25 01:46:53 +00:00
TheBusyBiscuit
655fb44021
[CI skip] Merge pull request #2022 from TheBusyBiscuit/gitlocalize-12200 
Translate added section in messages into Japanese.
 2020-06-25 02:35:25 +02:00
TheBusyBiscuit
d3a30347fd
[CI skip] Merge pull request #2021 from TheBusyBiscuit/gitlocalize-12199 
Translate added section in categories into Japanese.
 2020-06-25 02:34:46 +02:00
bito-blosh
5d4bc5c769 Translate researches_ja.yml via GitLocalize 2020-06-25 00:21:47 +00:00
TheBusyBiscuit
1d43faeb76 Translate messages_ja.yml via GitLocalize 2020-06-25 00:13:08 +00:00
bito-blosh
89357ba7db Translate categories_ja.yml via GitLocalize 2020-06-25 00:13:06 +00:00
LinoxGH
8f0c5100d4
Merge branch 'master' into AutoBrewer 2020-06-24 22:38:15 +03:00
TheBusyBiscuit
c64b311ee2 Finished merge of PR #2015 and updated language keys 2020-06-24 21:25:21 +02:00
TheBusyBiscuit
cccc8f2162
[CI skip] Merge pull request #2015 from LinoxGH/master 
Added Magic Pills. The Edited Version
 2020-06-24 21:11:30 +02:00
LinoxGH
4832701fda Added a research for the recipe. 2020-06-24 21:41:35 +03:00
LinoxGH
4f6bbafdfc Added Auto Brewer. 
A new medium machine that can create potions automatically.
 2020-06-24 21:24:16 +03:00
TheBusyBiscuit
58ccc4b87a Added Tagalog 2020-06-24 20:18:55 +02:00
TheBusyBiscuit
db3bb29777
[CI skip] Merge pull request #2019 from Neon72/patch-1 
Fortune cookies
 2020-06-24 20:18:18 +02:00
Neon72
cc8564a1f1
Fortune Cookies #2 
You meant like this Cookie? (I realised 5 seconds after I posted the comment what you meant)
 2020-06-24 20:15:07 +02:00
TheBusyBiscuit
750307d487
[CI skip] Merge pull request #2018 from TheBusyBiscuit/gitlocalize-12195 
Added Tagalog
 2020-06-24 20:11:50 +02:00
TheBusyBiscuit
0578c1349e
[CI skip] Merge pull request #2017 from TheBusyBiscuit/gitlocalize-12188 
Added tagalog translations for researches
 2020-06-24 20:11:34 +02:00
TheBusyBiscuit
8550092b26
[CI skip] Merge pull request #2011 from TheBusyBiscuit/gitlocalize-12174 
Added some translations for Tagalog
 2020-06-24 20:11:08 +02:00
Neon72
8b87fe8b06
Fortune Cookies Fix #1 
I have "escaped" the single quote issue
 2020-06-24 19:42:55 +02:00
Scott Gomez Andoy
6f5adfd31a Translate messages_tl.yml via GitLocalize 2020-06-24 16:55:51 +00:00
LinoxGH
07224cc7d5 Added Enchantment Rune. 
Added Enchantment Rune that applies a random enchantment on items.
Works similar to Soulbound Rune.
 2020-06-24 16:28:35 +03:00
Scott Gomez Andoy
258467ef3a Translate researches_tl.yml via GitLocalize 2020-06-24 08:12:52 +00:00
AOJUCBJD
9019f268af Translate categories_ko.yml via GitLocalize 2020-06-24 08:07:47 +00:00
LinoxGH
3278457441 Did the requested changes. 2020-06-24 01:06:48 +03:00
MintFighter
47c53a0e36
Fortune cookies 
a few more quotes for fortune cookies
 2020-06-23 00:37:20 +02:00
Scott Gomez Andoy
c2a850b732 Translate resources_tl.yml via GitLocalize 2020-06-22 10:00:53 +00:00
Scott Gomez Andoy
2c1e1cacad Translate recipes_tl.yml via GitLocalize 2020-06-22 10:00:50 +00:00
Scott Gomez Andoy
8d6640693f Translate categories_tl.yml via GitLocalize 2020-06-22 10:00:48 +00:00