mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Code Releases Activity
5,932 Commits 1 Branch 0 Tags 64 MiB
418b6ffa74
Commit Graph

1187 Commits

Author SHA1 Message Date
KingDeadZ
a6c8f3b437 Translate messages_hu.yml via GitLocalize 2021-01-07 11:43:21 +00:00
TheBusyBiscuit
0a5ca8d9f6
Update messages_vi.yml 2021-01-06 21:33:51 +01:00
CactusTheGuy
8c7f28f11b Translate researches_vi.yml via GitLocalize 2021-01-06 20:30:21 +00:00
Vương Vinh
3cded3d28b Translate researches_vi.yml via GitLocalize 2021-01-06 20:30:20 +00:00
nahkd123
3c41b341d1 Translate researches_vi.yml via GitLocalize 2021-01-06 20:30:19 +00:00
Just Mango
c0a06e4862 Translate researches_vi.yml via GitLocalize 2021-01-06 20:30:18 +00:00
TheBusyBiscuit
2734cc9f25 Translate messages_vi.yml via GitLocalize 2021-01-06 20:30:17 +00:00
Just Mango
1ae2adaf2e Translate messages_vi.yml via GitLocalize 2021-01-06 20:30:15 +00:00
CactusTheGuy
7cda34d47a Translate messages_vi.yml via GitLocalize 2021-01-06 20:30:14 +00:00
nahkd123
a64cdec153 Translate messages_vi.yml via GitLocalize 2021-01-06 20:30:13 +00:00
Gustavo de Souza
47d5d356d3 Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:19 +00:00
DayOS
389dc388ed Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:18 +00:00
Marcio
c613d1220f Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:16 +00:00
Sxigames
58113d9aff Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:15 +00:00
FaolanMalcadh
1fa59c7d31 Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:14 +00:00
TheBusyBiscuit
a2be3d1255 Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:13 +00:00
krazybeat
a65a61a557 Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:12 +00:00
Gustavo de Souza
cee50cd615 Translate resources_pt.yml via GitLocalize 2021-01-06 19:48:33 +00:00
TheBusyBiscuit
10b11e7bdf Made requested changes 2021-01-06 18:10:32 +01:00
TheBusyBiscuit
318c154e78 Fixed locale path 2021-01-06 17:56:03 +01:00
TheBusyBiscuit
b6f257bff1 Fixed whitespaces in yaml 2021-01-06 17:54:58 +01:00
TheBusyBiscuit
4f21d06c69 Added verbose flag to /sf timings 2021-01-06 17:52:46 +01:00
Nikolay
3acdcec70f Translate categories_bg.yml via GitLocalize 2021-01-02 19:42:31 +00:00
Nikolay
e89363e8bb Translate recipes_bg.yml via GitLocalize 2021-01-02 19:42:30 +00:00
TheBusyBiscuit
60acccfb28
[CI skip] Merge pull request #2671 from Slimefun/gitlocalize-14557 
update translation
 2021-01-02 20:37:25 +01:00
Aeris One
863306d2df Translate messages_fr.yml via GitLocalize 2021-01-01 16:07:21 +00:00
Pierre
270382d7ec Translate messages_fr.yml via GitLocalize 2021-01-01 16:07:19 +00:00
Aeris One
b23972c7dd Translate researches_fr.yml via GitLocalize 2021-01-01 16:06:53 +00:00
TheRetix
b41a4df823 Translate researches_fr.yml via GitLocalize 2021-01-01 16:06:52 +00:00
svr333
3c3836a3f5
Merge branch master from upstream 2020-12-22 22:45:33 +01:00
Nameless
6be86e99be Translate researches_zh-CN.yml via GitLocalize 2020-12-19 14:28:02 +00:00
Nameless
7659ae892f Translate messages_zh-CN.yml via GitLocalize 2020-12-19 14:27:59 +00:00
TheBusyBiscuit
2ced45b485
Merge pull request #2609 from Slimefun/refactoring/third-party-integrations 
Refactored integrations (+ Fixed #2575)
 2020-12-17 15:30:16 +01:00
TheBusyBiscuit
d70e79ccfa
[CI skip] Merge pull request #2623 from Slimefun/gitlocalize-14291 
messges_es
 2020-12-17 13:36:21 +01:00
DaHolyCheese
b99f04eab4 Translate researches_es.yml via GitLocalize 2020-12-12 14:51:08 +00:00
Luu7
67112e29ac Translate messages_es.yml via GitLocalize 2020-12-12 14:50:26 +00:00
TheBusyBiscuit
86e677cd93 Translate messages_de.yml via GitLocalize 2020-12-12 13:23:55 +00:00
TheBusyBiscuit
e56ba77002 Translate researches_de.yml via GitLocalize 2020-12-12 13:23:54 +00:00
TheBusyBiscuit
a95652f718
[CI skip] Merge pull request #2620 from Slimefun/gitlocalize-14285 
add zh-TW version of bee armor research
 2020-12-12 14:05:04 +01:00
TheBusyBiscuit
f32be5649a
[CI skip] Merge pull request #2619 from Slimefun/gitlocalize-14284 
add zh-TW version of bee armor message
 2020-12-12 14:04:29 +01:00
TheBusyBiscuit
f84faab48d
[CI skip] Merge pull request #2615 from Slimefun/gitlocalize-14281 
Updated Russian localizations
 2020-12-12 14:03:49 +01:00
TheBusyBiscuit
88b6e6d9af
[CI skip] Merge pull request #2617 from Slimefun/gitlocalize-14283 
Updated Hungarian translations
 2020-12-12 14:02:53 +01:00
bito-blosh
3825fa5d4b Translate researches_ja.yml via GitLocalize 2020-12-11 20:09:09 +00:00
TheBusyBiscuit
def67399c4 Translate messages_ja.yml via GitLocalize 2020-12-11 20:09:06 +00:00
HeroBrineKing
4e510aefc8 Translate researches_zh-TW.yml via GitLocalize 2020-12-11 13:07:36 +00:00
TheBusyBiscuit
4fd973b3b1 Translate messages_zh-TW.yml via GitLocalize 2020-12-11 13:07:09 +00:00
poma123
b43277c0f4 Translate researches_hu.yml via GitLocalize 2020-12-11 12:36:35 +00:00
TheBusyBiscuit
f36743cfe3 Translate messages_hu.yml via GitLocalize 2020-12-11 12:36:33 +00:00
SoSeDiK
fc97648abb Translate researches_ru.yml via GitLocalize 2020-12-11 12:11:41 +00:00
SoSeDiK
8d7e15df81 Translate messages_ru.yml via GitLocalize 2020-12-11 12:11:38 +00:00
TheBusyBiscuit
498da0e00a
[CI skip] Merge pull request #2598 from Slimefun/feature/bee-armor 
Added Bee Armor
 2020-12-11 13:05:20 +01:00
TheBusyBiscuit
36be4c29de More refactoring 2020-12-09 13:33:34 +01:00
TheBusyBiscuit
7d9e726102 More refactoring 2020-12-09 12:39:24 +01:00
TheBusyBiscuit
2e13cd2e88 Refactoring for third-party integrations 2020-12-08 21:07:48 +01:00
Just Mango
555aa050a1 Translate categories_vi.yml via GitLocalize 2020-12-07 11:16:58 +00:00
TheBusyBiscuit
9504e523f4
Merge branch 'master' into feature/bee-armor 2020-12-05 21:43:40 +01:00
TheBusyBiscuit
96e38608f9 Added 4 bricks -> 1 brick block recipe to the Electric Press 2020-12-01 16:37:51 +01:00
Nameless
3a5bfd75cb Translate researches_zh-CN.yml via GitLocalize 2020-11-28 10:37:27 +00:00
TheBusyBiscuit
354dd30e52 Removed EmeraldEnchants integration 2020-11-23 16:58:08 +01:00
TheBusyBiscuit
876fbda585
[CI skip] Merge pull request #2564 from Slimefun/gitlocalize-14181 
Update pt-BR translations
 2020-11-23 16:35:47 +01:00
Gustavo de Souza
bf06e2be83 Translate categories_pt.yml via GitLocalize 2020-11-23 12:36:03 +00:00
Mauricio Roberto
ac1788a98c Translate researches_pt-BR.yml via GitLocalize 2020-11-23 12:35:09 +00:00
TheBusyBiscuit
0cdd21f6bb Added a config option to delete excess cargo network items 2020-11-15 16:29:45 +01:00
TheBusyBiscuit
f1d4b50b67 One more tweak 2020-11-10 01:09:50 +01:00
TheBusyBiscuit
97cbe72a91 Some tweaks to the experimental bee wings 2020-11-10 01:04:15 +01:00
TheBusyBiscuit
f3cf421f0e Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into bee-armor 2020-11-10 00:40:59 +01:00
TheBusyBiscuit
dee7ded9cd
Merge pull request #2537 from Slimefun/gitlocalize-14021 
fix of messenge_zh-TW
 2020-11-08 23:40:14 +01:00
TheBusyBiscuit
a5704aee3f
Merge pull request #2388 from svr333/MoreTalismans 
More talismans
 2020-11-08 23:35:40 +01:00
TheBusyBiscuit
3170f143a2 Added a config option to disable network visualizations 2020-11-04 11:18:06 +01:00
Wei-Liang Liou
b9f1e6d688 Translate messages_zh-TW.yml via GitLocalize 2020-11-04 10:08:41 +00:00
Wei-Liang Liou
b076d9ee64 Translate categories_zh-TW.yml via GitLocalize 2020-11-03 15:33:31 +00:00
TheBusyBiscuit
d69cf78331
Merge branch 'master' into MoreTalismans 2020-11-02 15:12:56 +01:00
TheBusyBiscuit
1141a01fd0 Fixes #2519 2020-11-01 20:46:29 +01:00
HeroBrineKing
519140ede6 Translate resources_zh-TW.yml via GitLocalize 2020-10-31 11:50:41 +00:00
HeroBrineKing
36460ed11f Translate researches_zh-TW.yml via GitLocalize 2020-10-31 11:50:40 +00:00
HeroBrineKing
7ecdbbc97d Translate recipes_zh-TW.yml via GitLocalize 2020-10-31 11:50:39 +00:00
TheBusyBiscuit
935a36cfbd Translate messages_zh-TW.yml via GitLocalize 2020-10-31 11:50:36 +00:00
HeroBrineKing
5fafac0f84 Translate categories_zh-TW.yml via GitLocalize 2020-10-31 11:50:35 +00:00
TheBusyBiscuit
3bf7dfc1c3
Update recipes_ko.yml 2020-10-31 10:17:59 +01:00
20181241
aa29c33625 Translate recipes_ko.yml via GitLocalize 2020-10-31 09:15:24 +00:00
TheBusyBiscuit
192258fb74
Merge branch 'master' into MoreTalismans 2020-10-30 22:54:36 +01:00
svr333
33f0d0a4bc Change not-valid to invalid 2020-10-29 15:06:52 +01:00
poma123
99946174de Translate researches_hu.yml via GitLocalize 2020-10-25 14:40:55 +00:00
András Marczinkó
18f384e9cc Translate messages_hu.yml via GitLocalize 2020-10-25 14:40:53 +00:00
TheBusyBiscuit
094d4a6ae0
Fixes #2493 2020-10-20 16:45:31 +02:00
TheBusyBiscuit
1998c7746f
Merge pull request #2477 from J3fftw1/fix/#2470 
fixes #2470
 2020-10-18 19:22:04 +02:00
Panda.com
0a4f666094 me dumb 2020-10-18 16:06:19 +02:00
Panda.com
b4cd8e0d0c added Unit Test 2020-10-18 16:01:32 +02:00
Panda.com
e3df3ab012 added tall_flowers.json and requested changes 2020-10-18 15:47:47 +02:00
Panda.com
dc025c7b28 fix 2020-10-18 14:31:54 +02:00
Panda.com
3d364ee331 did requested changes 2020-10-18 13:48:38 +02:00
TheBusyBiscuit
56a1ee5336 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-10-18 13:17:29 +02:00
Nameless
de1e846382 Translate researches_zh-CN.yml via GitLocalize 2020-10-18 02:44:36 +00:00
Nameless
f9d4be9cbb Translate messages_zh-CN.yml via GitLocalize 2020-10-18 02:44:33 +00:00
Panda.com
e5d341485f Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into fix/#2470 
# Conflicts:
#	src/main/resources/tags/block_placer_ignored_materials.json
 2020-10-17 13:37:41 +02:00
TheBusyBiscuit
07eba9319a Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
bee-armor

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunBootsListener.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java
 2020-10-17 13:28:30 +02:00
TheBusyBiscuit
9f3e2bba7c [CI skip] Removed a troublesome config setting 2020-10-17 13:22:22 +02:00
TheBusyBiscuit
4aff61f3b1 Removed 1.13 support 2020-10-17 12:54:36 +02:00
Timotiyadeyhakesem
ca6962811f Translate categories_he.yml via GitLocalize 2020-10-16 21:57:07 +00:00
Panda.com
49c7d3ad23 14* prs 2020-10-15 15:49:00 +02:00
Panda.com
c00ded786a fix? 2020-10-15 15:46:01 +02:00
Panda.com
372c6b41b1 a 2020-10-15 15:45:23 +02:00
Panda.com
349c57aef4 a 2020-10-15 15:44:32 +02:00
Panda.com
7dbbb87af5 ? 2020-10-15 15:43:28 +02:00
Panda.com
6611eaf444 idk whats wrong with "values" 2020-10-15 15:43:06 +02:00
Panda.com
29541cdfe2 Someone else can go format this if its not good 2020-10-15 15:41:21 +02:00
Panda.com
16bf13b2af stop bullying 2020-10-15 15:12:03 +02:00
Panda.com
3b43dd7ebc good now? 2020-10-15 15:08:42 +02:00
Panda.com
ee3e358f31 :pansad: 2020-10-15 15:07:50 +02:00
Panda.com
27583fc3f0 1 eternity later 2020-10-15 15:05:06 +02:00
Panda.com
0b27ea6ed5 ? 2020-10-15 15:03:02 +02:00
Panda.com
b70949a386 fixed fingerscrossed 2020-10-15 14:59:44 +02:00
Panda.com
78dcaa4328 fixes #2470 2020-10-15 14:42:44 +02:00
Pierre
36ccb4e5eb Translate messages_fr.yml via GitLocalize 2020-10-15 11:51:12 +00:00
TheBusyBiscuit
a5ee1cda5a Translate messages_ja.yml via GitLocalize 2020-10-14 22:42:51 +00:00
Scott Gomez Andoy
c2ade61beb Translate researches_tl.yml via GitLocalize 2020-10-14 17:18:24 +00:00
Scott Gomez Andoy
20b8dbf09d Translate messages_tl.yml via GitLocalize 2020-10-14 17:18:23 +00:00
TheBusyBiscuit
b88bad3ef6 Fixes #2452 2020-10-14 14:56:52 +02:00
TheBusyBiscuit
8440143f41 Refactoring 2020-10-14 13:20:12 +02:00
TheBusyBiscuit
50e926d18a Fixes #2457 2020-10-14 00:34:04 +02:00
TheBusyBiscuit
de1eaca1dc Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-10-14 00:24:52 +02:00
TheBusyBiscuit
19de4c8476 Fixes #2454 (Added mcMMO support) 2020-10-14 00:24:01 +02:00
TheBusyBiscuit
692fa38246
[CI skip] Merge pull request #2461 from Slimefun/gitlocalize-13398 
Updated Russian localizations
 2020-10-13 23:26:48 +02:00
TheBusyBiscuit
4a53e82414
[CI skip] Merge pull request #2463 from Slimefun/gitlocalize-13432 
Update Japanese translation file.
 2020-10-13 23:25:07 +02:00
LinoxGH
4b39d6d58b Translate researches_tr.yml via GitLocalize 2020-10-13 13:53:26 +00:00
bito-blosh
97e0c660b2 Translate researches_ja.yml via GitLocalize 2020-10-12 18:40:38 +00:00
Senne Van Rompaey
db95cca3fb
Merge branch 'master' into MoreTalismans 2020-10-12 19:59:16 +02:00
TheBusyBiscuit
e2101c4ac9 Translate messages_ru.yml via GitLocalize 2020-10-12 14:26:50 +00:00
SoSeDiK
86d94a3122 Translate researches_ru.yml via GitLocalize 2020-10-12 14:26:49 +00:00
TheBusyBiscuit
87d319cd02
Merge pull request #2382 from LinoxGH/EnergyConnector 
Energy Connectors
 2020-10-12 15:49:50 +02:00
Senne Van Rompaey
4d474de290
Merge branch 'master' into MoreTalismans 2020-10-12 00:57:11 +02:00
TheBusyBiscuit
86b46939d1
[CI skip] Merge pull request #2442 from Slimefun/gitlocalize-13359 
new translations
 2020-10-11 01:36:41 +02:00
Pierre
b7da3d816d Translate messages_fr.yml via GitLocalize 2020-10-10 23:22:55 +00:00
Pierre
1fb8a2f66c Translate researches_fr.yml via GitLocalize 2020-10-10 23:22:38 +00:00
LinoxGH
ad505b6cef
Merge branch 'master' into EnergyConnector 2020-10-11 00:26:43 +03:00
TheBusyBiscuit
fa1cecef2f
[CI skip] Merge pull request #2436 from Slimefun/gitlocalize-13355 
Updated bulgarian translations
 2020-10-10 19:44:00 +02:00
TheBusyBiscuit
6434c79a0a Translate messages_de.yml via GitLocalize 2020-10-10 17:33:22 +00:00
TheBusyBiscuit
1088aea40e Translate researches_de.yml via GitLocalize 2020-10-10 17:33:20 +00:00
DNBGlol
01fc7cd536 Translate categories_bg.yml via GitLocalize 2020-10-10 17:28:03 +00:00
DNBGlol
c2ca5a1ea5 Translate resources_bg.yml via GitLocalize 2020-10-10 17:28:02 +00:00
TheBusyBiscuit
44e6449f9e
Merge pull request #2430 from Slimefun/gitlocalize-13351 
Update messages_nl.yml
 2020-10-10 15:27:19 +02:00
TheBusyBiscuit
c9ca11c62c
[CI skip] Merge pull request #2431 from Slimefun/gitlocalize-13352 
Update recipes_nl.yml
 2020-10-10 15:26:19 +02:00
Senne Van Rompaey
47d39cdc3c Translate categories_nl.yml via GitLocalize 2020-10-10 13:12:28 +00:00
milvantiou
025021f5b5 Translate categories_nl.yml via GitLocalize 2020-10-10 13:12:27 +00:00
Sven313D
af608e3c13 Translate recipes_nl.yml via GitLocalize 2020-10-10 12:42:09 +00:00
Senne Van Rompaey
e80b3b64d2 Translate messages_nl.yml via GitLocalize 2020-10-10 12:27:12 +00:00
TheBusyBiscuit
4c47a9cb93
Merge pull request #2298 from Slimefun/tags 
Implemented Tags
 2020-10-10 13:38:48 +02:00
TheBusyBiscuit
cf6add1149 Some small improvements before the merge 2020-10-10 13:36:07 +02:00
TheBusyBiscuit
c03b54c2c3
[CI skip] Merge pull request #2417 from Slimefun/gitlocalize-13345 
Updated Hungarian translations
 2020-10-10 01:25:10 +02:00
LinoxGH
26d46c2dc9 Translate researches_tr.yml via GitLocalize 2020-10-09 14:48:14 +00:00