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
5,490 Commits 1 Branch 0 Tags 64 MiB
e36027fb48
Commit Graph

1058 Commits

Author SHA1 Message Date
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
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
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
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
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
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
LinoxGH
7e3866a25b Translate messages_tr.yml via GitLocalize 2020-10-09 14:48:12 +00:00
poma123
72f7441a18
Small fixes 2020-10-09 16:36:25 +02:00
poma123
b7b7fa8a34 Translate researches_hu.yml via GitLocalize 2020-10-09 14:30:47 +00:00
poma123
076f1b51a4 Translate resources_hu.yml via GitLocalize 2020-10-09 14:30:45 +00:00
poma123
5ac0792cb0 Translate recipes_hu.yml via GitLocalize 2020-10-09 14:30:43 +00:00
poma123
f3fafaff26 Translate categories_hu.yml via GitLocalize 2020-10-09 14:30:42 +00:00
poma123
bd0f15bc95 Translate messages_hu.yml via GitLocalize 2020-10-09 14:30:38 +00:00
bito-blosh
3e20911c48 Translate researches_ja.yml via GitLocalize 2020-10-09 12:13:19 +00:00
TheBusyBiscuit
c440fd0778 Translate messages_ja.yml via GitLocalize 2020-10-09 12:13:17 +00:00
TheBusyBiscuit
2d00f3e704
Merge branch 'master' into tags 2020-10-08 16:16:11 +02:00
LinoxGH
4bf08db1d1
Merge branch 'master' into EnergyConnector 2020-10-08 15:53:08 +03:00
TheBusyBiscuit
01d233af4d
Merge pull request #2402 from NCBPFluffyBear/gps-permission-fix 
GPS Control Panel and GEO Scanner access checks
 2020-10-08 14:37:16 +02:00
TheBusyBiscuit
08ed8b21c8
Merge branch 'bee-armor' into beeArmor 2020-10-07 22:14:39 +02:00
NCBPFluffyBear
b577c1e4a3 Did changes 2020-10-07 13:45:49 -05:00
LinoxGH
eb572a1a77
Merge branch 'master' into EnergyConnector 2020-10-07 18:10:50 +03:00
poma123
7814bdcdee
Merge branch 'master' into tags 2020-10-07 16:11:41 +02:00
TheBusyBiscuit
47590ac972
Merge branch 'master' into tags 2020-10-06 21:07:49 +02:00
Seggan
bb24bdd837 Merge remote-tracking branch 'upstream/master' 2020-10-05 10:55:26 -04:00
Om Uparkar
bf625c3371 corrected spelling mistakes and stuff in wiki.json 2020-10-05 11:55:53 +05:30
Seggan
3dcd5942aa Changed some linguistic things (Biscuit needs to be an English professor) 2020-10-04 22:03:48 -04:00