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
3,049 Commits 1 Branch 0 Tags 64 MiB
7e04566393
Commit Graph

2333 Commits

Author SHA1 Message Date
HeroBrineKing
263a920732 Translate categories_zh-TW.yml via GitLocalize 2020-02-08 20:34:16 +00:00
HeroBrineKing
c639595637 Translate resources_zh-TW.yml via GitLocalize 2020-02-08 20:33:25 +00:00
TheBusyBiscuit
5e0e260dae Translate resources_zh-TW.yml via GitLocalize 2020-02-08 20:33:23 +00:00
TheBusyBiscuit
447683b600 [CI skip] Refactoring 2020-02-08 20:50:21 +01:00
TheBusyBiscuit
7d38654452 [CI skip] Merge pull request #1495 from TheBusyBiscuit/gitlocalize-10794 
messages_es
 2020-02-08 20:49:26 +01:00
TheBusyBiscuit
3faacfbd53
[CI skip] Merge pull request #1496 from TheBusyBiscuit/gitlocalize-10795 
researches_es
 2020-02-08 20:48:36 +01:00
TheBusyBiscuit
e7783ad8fc [CI skip] Merge pull request #1494 from TheBusyBiscuit/gitlocalize-10793 
Resources_es
 2020-02-08 20:48:12 +01:00
Luu7
a52fc39977 Translate researches_es.yml via GitLocalize 2020-02-08 19:45:09 +00:00
dbzjjoe
6508489b8f Translate researches_es.yml via GitLocalize 2020-02-08 19:45:07 +00:00
Luu7
3131774b5e Translate messages_es.yml via GitLocalize 2020-02-08 19:44:42 +00:00
Luu7
fb04b87030 Translate resources_es.yml via GitLocalize 2020-02-08 19:44:11 +00:00
dbzjjoe
6fe8ccf10e Translate resources_es.yml via GitLocalize 2020-02-08 19:44:08 +00:00
Luu7
f74d2276de Translate categories_es.yml via GitLocalize 2020-02-08 19:41:46 +00:00
dbzjjoe
15aab25b76 Translate categories_es.yml via GitLocalize 2020-02-08 19:36:31 +00:00
Luu7
a3a600c6e9 Translate categories_es.yml via GitLocalize 2020-02-08 19:36:29 +00:00
TheBusyBiscuit
91856087f5
[CI skip] Merge pull request #1491 from TheBusyBiscuit/gitlocalize-10790 
Updated hungarian resources
 2020-02-08 20:28:58 +01:00
András Marczinkó
8aa227e0ab Translate categories_hu.yml via GitLocalize 2020-02-08 19:28:32 +00:00
András Marczinkó
454e46c86a Translate resources_hu.yml via GitLocalize 2020-02-08 19:28:05 +00:00
NihilistBrew
5674570175 small formatting 2020-02-08 13:58:01 +01:00
TheBusyBiscuit
340258323b
[CI skip] Merge pull request #1486 from TheBusyBiscuit/gitlocalize-10787 
Translation 2
 2020-02-08 11:11:38 +01:00
Turret
1016c0942f Translate resources_sv.yml via GitLocalize 2020-02-08 09:57:20 +00:00
Turret
ab4e8a3bf0 Translate categories_sv.yml via GitLocalize 2020-02-08 09:49:51 +00:00
NihilistBrew
5028911e84 Translate categories_sv.yml via GitLocalize 2020-02-08 09:49:49 +00:00
Poma123
4f6ca04843
Merge pull request #2 from TheBusyBiscuit/master 
Comparing new changes
 2020-02-08 10:05:53 +01:00
TheBusyBiscuit
38830b3bdf [Ci skip] Updated translators 2020-02-08 10:02:12 +01:00
TheBusyBiscuit
d877698000
[Ci skip] Merge pull request #1475 from TheBusyBiscuit/gitlocalize-10777 
Update Categories in Vietnamese
 2020-02-08 10:01:40 +01:00
TheBusyBiscuit
d7280c110e
[CI skip] Merge pull request #1476 from TheBusyBiscuit/gitlocalize-10778 
Update Resources Vietnamese
 2020-02-08 10:01:22 +01:00
TheBusyBiscuit
3cc53ccb2d
[CI skip] Merge pull request #1478 from TheBusyBiscuit/gitlocalize-10780 
Update categories_zh-CN.yml
 2020-02-08 10:00:20 +01:00
TheBusyBiscuit
64a22b721f [Ci skip] Merge pull request #1479 from TheBusyBiscuit/gitlocalize-10781 
Update resources_zh-CN.yml
 2020-02-08 10:00:03 +01:00
TheBusyBiscuit
b55b2af133
[CI skip] Merge pull request #1477 from TheBusyBiscuit/gitlocalize-10779 
New words translated
 2020-02-08 09:59:25 +01:00
TheBusyBiscuit
4c01ec7e57
[Ci skip] Merge pull request #1481 from TheBusyBiscuit/gitlocalize-10783 
Resources - Slovak langugage
 2020-02-08 09:58:59 +01:00
TheBusyBiscuit
95e16089c5 [Ci skip] Merge pull request #1482 from TheBusyBiscuit/gitlocalize-10784 
Categories - Slovak language
 2020-02-08 09:58:17 +01:00
TheBusyBiscuit
231f8904c4
[Ci skip] Merge pull request #1483 from TheBusyBiscuit/gitlocalize-10785 
Localized categories to Russian
 2020-02-08 09:57:52 +01:00
poma123
9bb3fea54c Fix PickaxeOfContainmnet bug 2020-02-08 09:57:46 +01:00
SoSeDiK
6259064f38 Translate resources_ru.yml via GitLocalize 2020-02-08 08:51:43 +00:00
TomWiskis
3ab18bf79b Translate resources_ru.yml via GitLocalize 2020-02-08 08:51:41 +00:00
SoSeDiK
39949076ab Translate categories_ru.yml via GitLocalize 2020-02-08 08:51:20 +00:00
TomWiskis
32a6ac0266 Translate categories_ru.yml via GitLocalize 2020-02-08 08:51:18 +00:00
KillerXCoder
5254ea5f3b Translate categories_sk.yml via GitLocalize 2020-02-08 08:14:25 +00:00
KillerXCoder
539cd86a24 Translate resources_sk.yml via GitLocalize 2020-02-08 08:07:16 +00:00
Nameless
7d83a331c2 Translate resources_zh-CN.yml via GitLocalize 2020-02-08 06:23:40 +00:00
Nameless
12c4cb6df2 Translate categories_zh-CN.yml via GitLocalize 2020-02-08 06:23:11 +00:00
Dams_
1099e10036 Translate categories_fr.yml via GitLocalize 2020-02-08 03:05:42 +00:00
Edwin Kerforne
2c78456fa3 Translate categories_fr.yml via GitLocalize 2020-02-08 03:05:40 +00:00
JustAPieOP
01579cfeb6 Translate resources_vi.yml via GitLocalize 2020-02-08 02:49:49 +00:00
Julie-Sigtuna
37491587bc Translate resources_vi.yml via GitLocalize 2020-02-08 02:49:47 +00:00
Julie-Sigtuna
0b41496d76 Translate categories_vi.yml via GitLocalize 2020-02-08 02:47:53 +00:00
Just Mango
e9ab47e54a Translate categories_vi.yml via GitLocalize 2020-02-08 02:47:51 +00:00
TheBusyBiscuit
f68d110a43 [Ci skip] Minor design change 2020-02-08 02:55:49 +01:00
TheBusyBiscuit
71dcb17d25
[CI skip] Merge pull request #1473 from TheBusyBiscuit/gitlocalize-10775 
Added german GEO Resources
 2020-02-08 02:52:39 +01:00
TheBusyBiscuit
caecae4b0d Translate categories_de.yml via GitLocalize 2020-02-08 01:51:32 +00:00
TheBusyBiscuit
19d8ad88ea Translate resources_de.yml via GitLocalize 2020-02-08 01:47:11 +00:00
TheBusyBiscuit
f3c7bbdb43 [CI skip] Updated something 2020-02-08 02:38:54 +01:00
TheBusyBiscuit
4f94f87301
[Ci skip] Merge pull request #1467 from TheBusyBiscuit/gitlocalize-10773 
Messages - Slovak language
 2020-02-08 02:38:22 +01:00
TheBusyBiscuit
5317c46b2f [CI skip] "a shit ton" may be an understatement 2020-02-08 02:36:57 +01:00
KillerXCoder
2545948295 Translate messages_sk.yml via GitLocalize 2020-02-07 19:30:49 +00:00
TheBusyBiscuit
e10f5a9766
[CI skip] Merge pull request #1466 from TheBusyBiscuit/gitlocalize-10771 
Arabic Messages Translation
 2020-02-07 20:08:52 +01:00
Muhammad Kamal Fergany
792279cc2d Translate messages_ar.yml via GitLocalize 2020-02-07 18:35:57 +00:00
Muhammad Kamal Fergany
c8cf172b34 Translate researches_ar.yml via GitLocalize 2020-02-07 18:33:59 +00:00
András Marczinkó
e966742fd9 Translate researches_hu.yml via GitLocalize 2020-02-06 21:35:51 +00:00
TheBusyBiscuit
ee695f8dee [Ci skip] Code improvements 2020-02-06 22:31:45 +01:00
András Marczinkó
c61e919ec0 Translate messages_hu.yml via GitLocalize 2020-02-06 20:18:13 +00:00
NihilistBrew
063dea5796 Translate messages_sv.yml via GitLocalize 2020-02-06 19:38:49 +00:00
Turret
edf317ee64 Translate messages_sv.yml via GitLocalize 2020-02-06 19:38:48 +00:00
TheBusyBiscuit
ccc1048eed [CI skip] A little bit refactoring 2020-02-06 20:38:32 +01:00
TheBusyBiscuit
f9987d1308 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-02-06 20:25:07 +01:00
TheBusyBiscuit
a09e8e42cc
[Ci skip] Another test 2020-02-06 20:10:24 +01:00
TheBusyBiscuit
1163996360
[Ci skip] Test 2020-02-06 20:08:33 +01:00
TheBusyBiscuit
f5105c858f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-02-06 19:43:57 +01:00
Pierre
5b8343f909 Translate messages_fr.yml via GitLocalize 2020-02-06 18:34:08 +00:00
TheBusyBiscuit
df60d4c2fd [Ci skip] Updated translators 2020-02-06 19:20:37 +01:00
TheBusyBiscuit
c33054cffd [CI skip] Updated translators 2020-02-06 19:03:47 +01:00
TheBusyBiscuit
62e4712067 [CI skip] Updated languages 2020-02-05 23:34:17 +01:00
TheBusyBiscuit
28f1ba1aec Translate messages_zh-TW.yml via GitLocalize 2020-02-05 22:30:35 +00:00
HeroBrineKing
be0fb18617 Translate messages_zh-TW.yml via GitLocalize 2020-02-05 22:30:34 +00:00
TheBusyBiscuit
26bbf0794a [Ci skip] Fixed norwegian 2020-02-05 23:21:15 +01:00
TheBusyBiscuit
78cb1bf55a
[Ci skip] Merge pull request #1457 from TheBusyBiscuit/gitlocalize-10716 
Localized researches to Russian
 2020-02-05 23:20:29 +01:00
TheBusyBiscuit
ae1a3aa739
[CI skip] Merge pull request #1453 from TheBusyBiscuit/gitlocalize-10712 
Update messages_zh-CN.yml
 2020-02-05 23:20:10 +01:00
TheBusyBiscuit
a3fe369495
[Ci skip] Merge pull request #1451 from TheBusyBiscuit/gitlocalize-10706 
Fixed resource_vi.yml #3
 2020-02-05 23:19:53 +01:00
TheBusyBiscuit
5d12e4bf1d
[Ci skip] Merge pull request #1455 from TheBusyBiscuit/gitlocalize-10714 
Added more Russian messages
 2020-02-05 23:19:30 +01:00
TheBusyBiscuit
540e4c518b
[CI skip] Merge pull request #1456 from TheBusyBiscuit/gitlocalize-10715 
Messages - Slovak language
 2020-02-05 23:18:53 +01:00
TheBusyBiscuit
0eb9368dc3 [Ci skip] Updated vietnamese 2020-02-05 23:18:32 +01:00
TheBusyBiscuit
b22dd51954
Merge pull request #1452 from TheBusyBiscuit/gitlocalize-10707 
Updated some new line of messages_vi.yml
 2020-02-05 23:17:54 +01:00
TheBusyBiscuit
4d57e6e221
[Ci skip] Merge pull request #1454 from TheBusyBiscuit/gitlocalize-10713 
Improved a translation
 2020-02-05 23:17:32 +01:00
TheBusyBiscuit
a4e472cae4 Translate messages_de.yml via GitLocalize 2020-02-05 22:16:40 +00:00
TheBusyBiscuit
3786791044 [CI skip] Maybe fixed norwegian? 2020-02-05 22:16:09 +01:00
NihilistBrew
162a5e45f3
Update SlimefunItems.java 2020-02-05 16:13:22 +01:00
NihilistBrew
9a672b3fde
formatting 2020-02-05 15:43:13 +01:00
TomWiskis
3589491b2f Translate researches_ru.yml via GitLocalize 2020-02-05 12:14:22 +00:00
SoSeDiK
dc5d447d9b Translate researches_ru.yml via GitLocalize 2020-02-05 12:14:20 +00:00
KillerXCoder
7657a1338d Translate messages_sk.yml via GitLocalize 2020-02-05 12:13:53 +00:00
TomWiskis
ca4a9e7689 Translate messages_ru.yml via GitLocalize 2020-02-05 12:02:18 +00:00
SoSeDiK
7bb437e0c8 Translate messages_ru.yml via GitLocalize 2020-02-05 12:02:17 +00:00
Nameless
8ca32fe4ec Translate researches_zh-CN.yml via GitLocalize 2020-02-05 08:38:59 +00:00
Nameless
f0aaca54f4 Translate messages_zh-CN.yml via GitLocalize 2020-02-05 08:23:25 +00:00
Just Mango
5df2bc0edd Translate messages_vi.yml via GitLocalize 2020-02-05 02:19:43 +00:00
HSGamer
dbc3f7b492 Translate researches_vi.yml via GitLocalize 2020-02-05 02:16:43 +00:00
TheBusyBiscuit
916432c9ab [Ci skip] Added many more languages 2020-02-05 01:40:47 +01:00
András Marczinkó
1d85a7b56a Translate messages_hu.yml via GitLocalize 2020-02-04 22:28:40 +00:00
TheBusyBiscuit
f0a3ccc43c [CI skip] Reduced technical debt, improved performance, refactoring 2020-02-04 19:05:49 +01:00
TheBusyBiscuit
c37bb55bc5 Updated language files 2020-02-04 17:22:25 +01:00
TheBusyBiscuit
0ab4ca5a42
[CI skip] Merge pull request #1448 from TheBusyBiscuit/gitlocalize-10699 
Researches - Slovak language
 2020-02-04 17:21:09 +01:00
KillerXCoder
526afd1b04 Translate messages_sk.yml via GitLocalize 2020-02-04 14:19:56 +00:00
PixelHotDog
2c90117b34 Translate researches_sk.yml via GitLocalize 2020-02-04 14:18:44 +00:00
KillerXCoder
c553245c8f Translate researches_sk.yml via GitLocalize 2020-02-04 14:18:42 +00:00
TheBusyBiscuit
d6e174ca75
Merge pull request #1447 from TheBusyBiscuit/gitlocalize-10697 
Added german Researches
 2020-02-04 10:41:49 +01:00
TheBusyBiscuit
81a7725396 [Ci skip] Updated translators 2020-02-04 10:41:39 +01:00
TheBusyBiscuit
dc4a708057 Translate researches_de.yml via GitLocalize 2020-02-04 09:39:26 +00:00
daro2404
1fa8c7e3fc Translate researches_de.yml via GitLocalize 2020-02-04 09:36:21 +00:00
MeerBiene
825c992988 Translate researches_de.yml via GitLocalize 2020-02-04 09:36:19 +00:00
TheBusyBiscuit
e8f0d4a7a0 Translate researches_de.yml via GitLocalize 2020-02-04 09:36:17 +00:00
Pierre
17f63e2f27 Translate researches_fr.yml via GitLocalize 2020-02-03 23:53:51 +00:00
Dams_
4adc1a4e02 Translate researches_fr.yml via GitLocalize 2020-02-03 23:53:49 +00:00
TheBusyBiscuit
c952ac6477 [Ci skip] Minor UI update 2020-02-04 00:53:30 +01:00
TheBusyBiscuit
a44c6671ba Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-02-04 00:43:53 +01:00
TheBusyBiscuit
c1d885548a Languages now show their progress 2020-02-04 00:43:43 +01:00
Dams_
b320a1c340 Translate messages_fr.yml via GitLocalize 2020-02-03 23:32:41 +00:00
Edwin Kerforne
04016cc24a Translate messages_fr.yml via GitLocalize 2020-02-03 23:32:40 +00:00
Pierre
8f5656778f Translate messages_fr.yml via GitLocalize 2020-02-03 23:32:39 +00:00
TheBusyBiscuit
a864ddb59e Added Chinese (Taiwan) 2020-02-04 00:25:54 +01:00
TheBusyBiscuit
a15b32c964 Added Chinese (Taiwan) 2020-02-04 00:23:01 +01:00
TheBusyBiscuit
1fb420f7c0
[CI skip] Merge pull request #1444 from TheBusyBiscuit/gitlocalize-10691 
Added Chinese (Taiwan)
 2020-02-04 00:18:55 +01:00
TheBusyBiscuit
9d6767dfaa Translate messages_zh-TW.yml via GitLocalize 2020-02-03 23:15:46 +00:00
HeroBrineKing
2a59084b38 Translate messages_zh-TW.yml via GitLocalize 2020-02-03 23:15:44 +00:00
MIO.sh
082ea79108 Translate messages_zh-TW.yml via GitLocalize 2020-02-03 23:15:42 +00:00
HeroBrineKing
cf214a5bdb Translate researches_zh-TW.yml via GitLocalize 2020-02-03 23:12:03 +00:00
TheBusyBiscuit
cc8bb1bebb [Ci skip] Added SlimefunBranch enum 2020-02-03 23:09:32 +01:00
TheBusyBiscuit
2ab549f7a4 [Ci skip] Some small fixes 2020-02-03 22:52:19 +01:00
TheBusyBiscuit
f1c3b561f5
Merge pull request #1439 from TheBusyBiscuit/gitlocalize-10624 
Update translation
 2020-02-03 22:33:16 +01:00
TheBusyBiscuit
9266246e16 [Ci skip] Fixed swedish translation 2020-02-03 22:33:08 +01:00
TheBusyBiscuit
7abe781925
[Ci skip] Merge pull request #1440 from TheBusyBiscuit/gitlocalize-10625 
Update translation
 2020-02-03 22:31:16 +01:00
TheBusyBiscuit
1a902a902e
[CI skip] Merge pull request #1442 from TheBusyBiscuit/gitlocalize-10648 2020-02-03 22:30:13 +01:00
Turret
26f9c33d77 Translate researches_sv.yml via GitLocalize 2020-02-03 11:15:52 +00:00
Turret
3e322fe125 Translate messages_sv.yml via GitLocalize 2020-02-03 11:15:24 +00:00
Nameless
00bbccd6dc Translate messages_zh-CN.yml via GitLocalize 2020-02-03 05:14:20 +00:00
Nameless
069243aa89 Translate researches_zh-CN.yml via GitLocalize 2020-02-03 05:14:01 +00:00
TheBusyBiscuit
6f7f6c6323 Fixes #1438 2020-02-02 23:07:02 +01:00
Pierre
7267420c9c Translate messages_fr.yml via GitLocalize 2020-02-02 19:37:12 +00:00
TheBusyBiscuit
0bb8a11cd9 Fixes #1435 2020-02-02 20:20:57 +01:00
TheBusyBiscuit
7057e7fa53
Merge pull request #1433 from WalshyDev/patch-2 
Sync up cache stuff in BlockStorage
 2020-02-02 18:28:26 +01:00
TheBusyBiscuit
53345d0f8e Some refactoring + language updates 2020-02-02 18:27:32 +01:00
HSGamer
790068e0be Translate researches_vi.yml via GitLocalize 2020-02-02 16:10:27 +00:00
nahkd123
d8f9e35177 Translate researches_vi.yml via GitLocalize 2020-02-02 16:10:25 +00:00
Just Mango
cacae97738 Translate researches_vi.yml via GitLocalize 2020-02-02 16:10:23 +00:00
Julie-Sigtuna
c8373a65d3 Translate researches_vi.yml via GitLocalize 2020-02-02 16:10:22 +00:00
Daniel Walsh
99e8f5265a
Sync up cache stuff in BlockStorage 2020-02-02 16:01:47 +00:00
TheBusyBiscuit
b9986ff91b
[CI skip] Merge pull request #1432 from TheBusyBiscuit/gitlocalize-10619 
Looks correct
 2020-02-02 17:01:26 +01:00
TheBusyBiscuit
f870eea2a7 [Ci skip] Updated translators 2020-02-02 17:01:12 +01:00
Nouma
4f09086218 Translate researches_fr.yml via GitLocalize 2020-02-02 15:57:28 +00:00
Pierre
230cd061d9 Translate researches_fr.yml via GitLocalize 2020-02-02 15:57:26 +00:00
Dams_
a193fbda44 Translate researches_fr.yml via GitLocalize 2020-02-02 15:57:24 +00:00
Edwin Kerforne
2ef9beb082 Translate researches_fr.yml via GitLocalize 2020-02-02 15:57:22 +00:00
Just Mango
75849d440d Translate messages_vi.yml via GitLocalize 2020-02-02 15:53:55 +00:00
TheBusyBiscuit
548ec3fd6a [Ci skip] little fix 2020-02-02 16:37:59 +01:00
TheBusyBiscuit
437743558c Translate messages_de.yml via GitLocalize 2020-02-02 15:25:08 +00:00
TheBusyBiscuit
519d59e9c8 [CI skip] Added "unsupported language" to bStats Metrics 2020-02-02 16:22:41 +01:00
TheBusyBiscuit
b9c3d64735
[CI skip] Merge pull request #1429 from TheBusyBiscuit/gitlocalize-10616 
Polish translation for Slimefun4
 2020-02-02 16:11:33 +01:00
TheBusyBiscuit
21fe6b691a [Ci skip] Researches can now be translated 2020-02-02 16:11:18 +01:00
TheBusyBiscuit
b01ae9ba69 [CI skip] Added more translators 2020-02-02 15:43:41 +01:00
TheBusyBiscuit
b94c5ca55d [CI skip] Added researches to translatable files 2020-02-02 14:56:18 +01:00
kbartek05
805204fc64 Translate messages_pl.yml via GitLocalize 2020-02-02 11:23:46 +00:00
kbartek05
1c835cdd87 Translate messages_pl.yml via GitLocalize 2020-02-02 11:18:57 +00:00
machine-translation
abd60cb08e Translate messages_pl.yml via GitLocalize 2020-02-02 11:15:56 +00:00
Wirusiu
30de5f3355 Translate messages_pl.yml via GitLocalize 2020-02-02 11:15:54 +00:00
Paw
2ef0761d20 Translate messages_pl.yml via GitLocalize 2020-02-02 11:15:52 +00:00
kbartek05
4a8fe8fdcc Translate messages_pl.yml via GitLocalize 2020-02-02 11:15:50 +00:00
TheBusyBiscuit
aa5ab2f55e
Merge pull request #1427 from TheBusyBiscuit/gitlocalize-10613 
Added Russian
 2020-02-01 23:07:33 +01:00
TheBusyBiscuit
0b8d78c1f5 [Ci skip] Added russian translators 2020-02-01 23:07:21 +01:00
Костя
37a156a3a2 Translate messages_ru.yml via GitLocalize 2020-02-01 22:06:02 +00:00
SoSeDiK
9c42127287 Translate messages_ru.yml via GitLocalize 2020-02-01 22:06:00 +00:00
xXDOTTORXx
836311c78f Translate messages_it.yml via GitLocalize 2020-02-01 22:05:03 +00:00
András Marczinkó
86993d5957 Translate messages_hu.yml via GitLocalize 2020-02-01 15:05:08 +00:00
Edwin Kerforne
3c850cda63 Translate messages_fr.yml via GitLocalize 2020-02-01 11:21:47 +00:00
Pierre
b13796aeb3 Translate messages_fr.yml via GitLocalize 2020-02-01 11:21:46 +00:00
Dams_
07b0ac5159 Translate messages_fr.yml via GitLocalize 2020-02-01 11:21:45 +00:00
KillerXCoder
89241a303f Translate messages_sk.yml via GitLocalize 2020-02-01 11:18:01 +00:00
TheBusyBiscuit
a7c1b3a72f [Ci skip] Added StarWishsamas skin 2020-02-01 12:00:12 +01:00
TheBusyBiscuit
8216eecc21
Merge pull request #1419 from TheBusyBiscuit/gitlocalize-10599 
Added Vietnamese
 2020-02-01 11:08:44 +01:00
TheBusyBiscuit
4fd6647cfd [Ci skip] Prepare Vietnamese 2020-02-01 11:08:35 +01:00
Just Mango
742555a6f0 Translate messages_vi.yml via GitLocalize 2020-02-01 10:06:55 +00:00
HSGamer
15659adff8 Translate messages_vi.yml via GitLocalize 2020-02-01 10:06:54 +00:00
TheBusyBiscuit
2e2639e89f
Merge pull request #1418 from TheBusyBiscuit/gitlocalize-10597 
Added Chinese (China)
 2020-02-01 10:56:05 +01:00
TheBusyBiscuit
4b13cc4436
Merge pull request #1417 from TheBusyBiscuit/gitlocalize-10595 
Added Dutch
 2020-02-01 10:55:59 +01:00
TheBusyBiscuit
4a5eea2f03 [Ci skip] Updated translators 2020-02-01 10:55:46 +01:00
Nameless
fc4560adbb Translate messages_zh-CN.yml via GitLocalize 2020-02-01 09:54:00 +00:00
Senne Van Rompaey
3bd5de0ec5 Translate messages_nl.yml via GitLocalize 2020-02-01 09:47:42 +00:00
Dr4gonD
74e3cb38d1 Translate messages_nl.yml via GitLocalize 2020-02-01 09:47:40 +00:00
TheBusyBiscuit
ea3c95c92c Added 5 new languages; removed some old code 2020-02-01 09:57:38 +01:00
TheBusyBiscuit
8dfd9879f6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-02-01 09:46:25 +01:00
TheBusyBiscuit
37d9f021cf [Ci skip] Unlocked 5 more languages 2020-02-01 09:46:08 +01:00
Luu7
cd3a7aa429 Translate messages_es.yml via GitLocalize 2020-02-01 01:55:39 +00:00
Vravinite
a063204c7e Translate messages_es.yml via GitLocalize 2020-02-01 01:55:38 +00:00
TheBusyBiscuit
354ad2fc35 Translate messages_de.yml via GitLocalize 2020-02-01 00:44:23 +00:00
TheBusyBiscuit
6fa0850fc2 [ci skip] little change 2020-02-01 01:41:54 +01:00
TheBusyBiscuit
ea26ac49b1 Ree... Reeeee... Reeeeeeeee... REFACTORING 
(let's hope I didn't break anything)
 2020-02-01 01:32:38 +01:00
TheBusyBiscuit
73d17fd3d9 Little fix 2020-01-31 21:26:20 +01:00
TheBusyBiscuit
1b1a04cb1c Fixed swedish translation of "swedish" :kappa: 2020-01-31 21:24:04 +01:00
TheBusyBiscuit
dada3e37a0 Added Italian, Spanish, Swedish, Hungarian, Latvian and Slovak 2020-01-31 19:54:50 +01:00
TheBusyBiscuit
b02f59b6b6
[CI skip] Merge pull request #1413 from TheBusyBiscuit/gitlocalize-10590 
Added Hungarian
 2020-01-31 19:36:48 +01:00
TheBusyBiscuit
9815089619
[Ci skip] Merge pull request #1414 from TheBusyBiscuit/gitlocalize-10591 
Added Swedish
 2020-01-31 19:35:18 +01:00
TheBusyBiscuit
3204fc2d2c
[Ci skip] Merge pull request #1412 from TheBusyBiscuit/gitlocalize-10589 
Added Slovak
 2020-01-31 19:34:55 +01:00
TheBusyBiscuit
05af9b4217
[Ci skip] Merge pull request #1411 from TheBusyBiscuit/gitlocalize-10588 
Updated French
 2020-01-31 19:33:58 +01:00
TheBusyBiscuit
2897bc4a4e
[CI skip] Merge pull request #1410 from TheBusyBiscuit/gitlocalize-10587 
Added Spanish
 2020-01-31 19:33:43 +01:00
TheBusyBiscuit
4a681e6629
[CI skip] Merge pull request #1407 from TheBusyBiscuit/gitlocalize-10582 
Added Latvian
 2020-01-31 19:32:15 +01:00
TheBusyBiscuit
f32b00f585
[CI skip] Merge pull request #1406 from TheBusyBiscuit/gitlocalize-10579 
Added Italian
 2020-01-31 19:31:59 +01:00
TheBusyBiscuit
d566add2fa Translate messages_sv.yml via GitLocalize 2020-01-31 18:30:33 +00:00
Turret
7cef888134 Translate messages_sv.yml via GitLocalize 2020-01-31 18:30:31 +00:00
NihilistBrew
858dbdd902 Translate messages_sv.yml via GitLocalize 2020-01-31 18:30:29 +00:00
TheBusyBiscuit
6c29328a48 Translate messages_hu.yml via GitLocalize 2020-01-31 18:29:08 +00:00
András Marczinkó
727535f308 Translate messages_hu.yml via GitLocalize 2020-01-31 18:29:06 +00:00
PixelHotDog
6ec5f2dee2 Translate messages_sk.yml via GitLocalize 2020-01-31 18:26:42 +00:00
KillerXCoder
c7c68e24c3 Translate messages_sk.yml via GitLocalize 2020-01-31 18:26:39 +00:00
Dams_
f7b00fa3d1 Translate messages_fr.yml via GitLocalize 2020-01-31 18:25:02 +00:00
dbzjjoe
8b46e30e5d Translate messages_es.yml via GitLocalize 2020-01-31 18:24:49 +00:00
NotUmBr4
600762492c Translate messages_es.yml via GitLocalize 2020-01-31 18:24:47 +00:00
Vravinite
4128380e93 Translate messages_es.yml via GitLocalize 2020-01-31 18:24:45 +00:00
Luu7
d66be088dc Translate messages_es.yml via GitLocalize 2020-01-31 18:24:43 +00:00
AgnisT
afda7bb773 Translate messages_lv.yml via GitLocalize 2020-01-31 12:01:27 +00:00
TheBusyBiscuit
c8553a161b [Ci skip] Added a new translator 2020-01-31 11:14:50 +01:00
TheBusyBiscuit
c5a2376694 Translate messages_it.yml via GitLocalize 2020-01-31 10:13:15 +00:00
xXDOTTORXx
ad25fa7531 Translate messages_it.yml via GitLocalize 2020-01-31 10:13:13 +00:00
machine-translation
2821597e2a Translate messages_it.yml via GitLocalize 2020-01-31 10:13:11 +00:00
TheBusyBiscuit
1818da5cce [Ci skip] Forgot one thing 2020-01-31 09:53:13 +01:00
TheBusyBiscuit
a0d9e215fc Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-01-31 09:47:54 +01:00
TheBusyBiscuit
f0f3740a2c [CI skip] Minor refactoring 2020-01-31 09:47:04 +01:00
TheBusyBiscuit
1cc8b530a4
[CI skip] Merge pull request #1405 from TheBusyBiscuit/gitlocalize-10576 
Updated german translation
 2020-01-31 09:34:38 +01:00
TheBusyBiscuit
48589284bb Translate messages_de.yml via GitLocalize 2020-01-31 08:19:51 +00:00
TheBusyBiscuit
4cca09f6c9 [CI skip] Added a few more flags 2020-01-31 09:18:14 +01:00
TheBusyBiscuit
7423f579f4 Translate messages_de.yml via GitLocalize 2020-01-31 00:03:55 +00:00
TheBusyBiscuit
1db1168c09 [CI skip] Added more future language names 2020-01-31 00:59:36 +01:00
TheBusyBiscuit
704d3f47fa Fixed Minecraft recipes not showing correctly 2020-01-31 00:33:05 +01:00
TheBusyBiscuit
59abc2f2e2 Added french translation 2020-01-31 00:25:01 +01:00
TheBusyBiscuit
0ce71eab7f
Merge pull request #1404 from TheBusyBiscuit/gitlocalize-10575 
Added french translation
 2020-01-31 00:18:32 +01:00
TheBusyBiscuit
268f39cccd [Ci skip] Preparing for the french... 2020-01-31 00:18:19 +01:00
tnthomastn
26374ea5f7 Translate messages_fr.yml via GitLocalize 2020-01-30 23:10:39 +00:00
Dams_
828ad624fb Translate messages_fr.yml via GitLocalize 2020-01-30 23:10:37 +00:00
Edwin Kerforne
3f75d6fa37 Translate messages_fr.yml via GitLocalize 2020-01-30 23:10:36 +00:00
TheBusyBiscuit
6b7435a181 [CI skip] Added french translators 2020-01-31 00:09:57 +01:00
TheBusyBiscuit
800bd01688 Translate messages_de.yml via GitLocalize 2020-01-30 22:50:57 +00:00
TheBusyBiscuit
3bdaf04c88 Fixed wrong file encodings 2020-01-30 23:48:40 +01:00
TheBusyBiscuit
e05edcc7f0
Merge pull request #1402 from TheBusyBiscuit/gitlocalize-10572 
Added german translation
 2020-01-30 23:19:54 +01:00
TheBusyBiscuit
aa3007ef0a [Ci skip] Little preparation 2020-01-30 23:19:42 +01:00
TheBusyBiscuit
e5ce53f906 Translate messages_de.yml via GitLocalize 2020-01-30 21:50:14 +00:00
TheBusyBiscuit
761d52a9c6 Slimefun can now be translated (see wiki) 2020-01-30 22:03:17 +01:00
TheBusyBiscuit
911aa64e32
[CI skip] Added italian 2020-01-30 20:53:28 +01:00
TheBusyBiscuit
6dc0907728 [CI skip] Reduced technical debt 2020-01-29 02:25:25 +01:00
TheBusyBiscuit
b94e197f06 Fixes #1396 2020-01-28 23:42:05 +01:00
TheBusyBiscuit
2133f528a9 Possibly fixes #1313 + Performance Improvements 2020-01-28 23:36:28 +01:00
TheBusyBiscuit
1f672905d2 Fixes #1394 2020-01-28 21:05:45 +01:00
TheBusyBiscuit
4882c7e4cc Super extreme ultra mega refactor 3000 2020-01-27 01:05:28 +01:00
TheBusyBiscuit
9f07d6b8c1 Fixes #1385 2020-01-26 11:05:37 +01:00
TheBusyBiscuit
06558541f3 Added #1387 to CHANGELOG.md 2020-01-26 03:15:10 +01:00
TheBusyBiscuit
20af3fc8ed
[CI skip] Merge pull request #1387 from BigBadE/master 
Added support for furnaces and brewing stands to cargo nets.
 2020-01-26 03:08:23 +01:00
bigbade
83b97384b7 Fixed bad return 2020-01-25 20:04:01 -08:00
bigbade
f5e6a4fcad Removed random import 2020-01-25 19:04:00 -08:00
bigbade
38b2bab35b Removed debug statement 2020-01-25 18:44:31 -08:00
bigbade
9c8d65d654 Added support for furnaces and brewing stands to cargo nets. 2020-01-25 18:40:01 -08:00
TheBusyBiscuit
44e3fad238 [CI skip] Removed some old code 2020-01-25 19:09:49 +01:00
bigbade
669a999d01 Added comments, switched return for MagicSugar, and made MagicSugar ancient altar check pass on any dispensers/enchantment tables. 2020-01-25 09:09:58 -08:00
TheBusyBiscuit
47b0ae5d9b Finalized Merging of Pull Request #1382 2020-01-25 17:16:16 +01:00
TheBusyBiscuit
4c58e61fcc
[CI skip] Merge pull request #1382 from BigBadE/master 
Small bug fixing
 2020-01-25 17:11:22 +01:00
TheBusyBiscuit
53be0a1842 Fixed Network Particles and added a max-nodes config option 2020-01-25 14:20:58 +01:00
TheBusyBiscuit
81b80643d3 [Ci skip] Refactoring 2020-01-25 13:36:36 +01:00
TheBusyBiscuit
2d9df90b1b [Ci skip] Minor refactoring 2020-01-25 13:11:04 +01:00
bigbade
71d4b74d72 Null checking is a good idea. 2020-01-24 19:58:10 -08:00
bigbade
4145eeb82d Fixed formatting 2020-01-24 19:43:56 -08:00
bigbade
e49f7de412 Allowed MagicSugar to be placed on Altars. 2020-01-24 19:42:15 -08:00
bigbade
e2ff5b2b09 Fixed DebugFishListener casting BlockData of wall skulls to Rotatable instead of Directional. 2020-01-24 19:07:41 -08:00
TheBusyBiscuit
623e5a2f02 [CI skip] Refactored default-languages 2020-01-21 14:37:19 +01:00
NihilistBrew
27086b4775
Change typo 2020-01-19 15:13:20 +01:00
NihilistBrew
fbf8907181
Additional formatting 2020-01-19 12:19:13 +01:00
NihilistBrew
27b8f53db9
Normalize formatting of SlimefunSetup.java 2020-01-18 09:45:48 +01:00
TheBusyBiscuit
73b64e874e Added more message strings, Elevators now support multiple pages 2020-01-14 20:48:04 +01:00
TheBusyBiscuit
6b53679715 Added support for multiple pages to the Elevator 2020-01-14 02:10:20 +01:00
TheBusyBiscuit
53efbf9612 [CI skip] Some more optimizations 2020-01-12 18:39:06 +01:00
TheBusyBiscuit
08f25c58a9 Performance improvements and some cleanup 2020-01-12 18:10:09 +01:00
TheBusyBiscuit
b6ca510094
[Ci skip] Merge pull request #1368 from J3fftw1/Feature/added-string 
added string to BioGenerator
 2020-01-12 16:04:42 +01:00
Panda.com
0aebfdef8a removed unused import 2020-01-12 15:36:01 +01:00
Panda.com
1ba2fd2f29 added prismarine to grindestone 2020-01-12 15:35:17 +01:00
Panda.com
eff7e9581f added string to BioGenerator 2020-01-12 15:21:33 +01:00
TheBusyBiscuit
d28487f103 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-01-12 13:14:56 +01:00
TheBusyBiscuit
8a267cad3e Fixes #1364 2020-01-12 13:14:41 +01:00
Senne Van Rompaey
e3f0882415
Update wiki.json 
Add Auto-Panning-Machine, compressor, ore-washer, pressure-chamber, grind-stone and magic-workbench
 2020-01-12 13:04:57 +01:00
TheBusyBiscuit
51dfbaed8a Improved performance for GEO Miner and Oil Pump 2020-01-12 11:52:20 +01:00
TheBusyBiscuit
7c993ead57 [CI skip] Refactoring 2020-01-12 11:05:35 +01:00
TheBusyBiscuit
fe6caccee9 [CI skip] More refactoring 2020-01-12 11:01:29 +01:00
TheBusyBiscuit
b94121e55b Fixes #1366 2020-01-12 10:27:56 +01:00
TheBusyBiscuit
626a2ebdaf Refactoring, lots of refactoring 2020-01-12 02:05:33 +01:00
TheBusyBiscuit
1cbe3f9e1f A lot more refactoring and cleanup 2020-01-12 01:44:57 +01:00
TheBusyBiscuit
74f33764ad [CI skip] Added a "language" variable for PlaceholderAPI 2020-01-12 00:15:40 +01:00
TheBusyBiscuit
b715de5a5c [Ci skip] Reduced technical debt 2020-01-12 00:10:19 +01:00
TheBusyBiscuit
7bde982b8b [CI skip] More refactoring 2020-01-12 00:02:07 +01:00
TheBusyBiscuit
ffc0fe41f0 [CI skip] Refactoring 2020-01-11 23:58:05 +01:00
TheBusyBiscuit
55269d587c Added even more localization options 2020-01-11 23:03:35 +01:00
Daniel Walsh
90fadd27be [CI skip] New fortune cookie message (#1365) 2020-01-11 22:13:50 +01:00
TheBusyBiscuit
d1a6f0c61c Added more stuff to the messages.yml 2020-01-11 22:07:14 +01:00
TheBusyBiscuit
67bf0f9f47 [CI skip] Thanks git... 2020-01-11 20:58:14 +01:00
TheBusyBiscuit
a50756ccb2 [CI skip] Refactoring + very small performance optimization for androids 2020-01-11 20:56:33 +01:00
TheBusyBiscuit
86ec4e17ac Fix indentation 2020-01-11 20:20:49 +01:00
TheBusyBiscuit
2e7df8acd2 Minor fix 2020-01-11 20:17:12 +01:00
TheBusyBiscuit
2dfb9ce92a Refined and refactored Localization code 2020-01-11 20:12:53 +01:00
TheBusyBiscuit
be0035f2f9 Build 400 - Players can now select their language 2020-01-10 22:40:36 +01:00
TheBusyBiscuit
8735a8e1a3 [Ci skip] Super secret feature 2020-01-10 21:43:49 +01:00
TheBusyBiscuit
13110a4927 Added gitlocalize 2020-01-10 16:25:10 +01:00
TheBusyBiscuit
6207b6348a Refactoring 2020-01-10 00:13:01 +01:00
TheBusyBiscuit
3fa4e1615e [CI skip] Minor refactoring 2020-01-09 23:43:30 +01:00
TheBusyBiscuit
c375384288 Removed Solar Array 2020-01-09 23:34:06 +01:00
TheBusyBiscuit
66b573e10e Fixes #1355 2020-01-09 23:33:11 +01:00
BurningBrimstone
1f6cd506f6 [CI skip] Wiki.json Update (#1359) 
* Added all Technical Components

* Update wiki.json

Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2020-01-09 16:13:12 +01:00
Senne Van Rompaey
3d520ad9f1 [Ci skip] Add wiki references (#1357) 
Add wiki references for the entire Hazmat Suit, Armor Forge and Ore Crusher.
 2020-01-07 16:22:59 +01:00
TheBusyBiscuit
abcd579323 Removed old and deprecated API (Addons should all have switched over...) 2020-01-06 22:48:14 +01:00
TheBusyBiscuit
ec409886a6 Another try... Pushing this to stable! 2020-01-06 20:04:39 +01:00
TheBusyBiscuit
cb73d37ed6 [CI skip] Added Fuffles_ to the contributors list. 2020-01-06 00:35:39 +01:00
TheBusyBiscuit
9033df4a16 Reworked Guide Settings (again) and reverted last change 2020-01-05 23:32:59 +01:00
TheBusyBiscuit
c05f604d4f Fixes #1354 2020-01-05 21:50:17 +01:00
TheBusyBiscuit
ff6f160138 Updated Ore Crusher Recipes 2020-01-05 21:49:21 +01:00
TheBusyBiscuit
9ff093affa Oil Pump now shows its "Bucket -> Oil" recipe. 2020-01-05 14:30:50 +01:00
TheBusyBiscuit
1f7e03a270 Possibly fixes #1346 and other concurrency issues 2020-01-04 16:51:25 +01:00
TheBusyBiscuit
e5fd1ad5b4 Fixed Iron Golems being repaired with slimefun ingots 2020-01-04 16:32:23 +01:00
TheBusyBiscuit
2409978b1d Fixes #1332 2020-01-04 16:29:15 +01:00
TheBusyBiscuit
23a51b898e A lot more refactoring + technical debt reduction + minor optimizations 2020-01-04 15:40:45 +01:00
TheBusyBiscuit
3c32ca6c60 Some cleanup 2020-01-04 13:55:33 +01:00
TheBusyBiscuit
6bae1098bc Fixes #1344 2020-01-03 16:59:11 +01:00
TheBusyBiscuit
69267983b9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-01-03 16:36:09 +01:00
TheBusyBiscuit
95adc66536 Fixed two small issues and did some cleanup 2020-01-03 16:35:55 +01:00
TheBusyBiscuit
e0b240f570 Reduced technical debt 2020-01-03 16:33:58 +01:00
penta
343342e739 Added more wiki entries (#1331) 2020-01-03 14:45:44 +01:00
TheBusyBiscuit
5b86ef1e7e
Merge pull request #1339 from mohkamfer/AutomatedCraftingChamberCraftLast 
Enable Automated Crafting Chamber To Craft Last Shaped Recipe
 2020-01-03 14:42:57 +01:00
TheBusyBiscuit
89d55430fb Radioactive items have a new lore! 2020-01-03 14:41:15 +01:00
TheBusyBiscuit
1b0d507783 Updated Radioactive - lore. You may need to convert some items... 2020-01-03 13:57:56 +01:00
Muhammad Kamal
667ec595ee Refactor getSerializsedInput()'s if conditions 2020-01-03 14:52:34 +02:00
Muhammad Kamal
e8a79a7c3a Refactor tick()'s if condition 2020-01-03 14:50:02 +02:00
TheBusyBiscuit
34a56a1bb6 Simplified some lore utilities 2020-01-03 13:33:21 +01:00
Muhammad Kamal
fc007273bb Fix ItemStack Amounts Greater Than 1 2020-01-03 14:10:32 +02:00
Muhammad Kamal
9d246adf93 Reformat Code 2020-01-03 14:04:43 +02:00
TheBusyBiscuit
84604752e3 [CI skip] Little file size optimization I guess? 2020-01-03 02:20:36 +01:00
Muhammad Kamal
f8c2983491 Enable Automated Crafting Chamber To Craft Last Shaped Recipe 2020-01-01 00:02:47 +02:00
TheBusyBiscuit
3773460561 Fixes #1337 2019-12-30 01:25:05 +01:00
TheBusyBiscuit
e90b8c18f7 [CI skip] Reduced technical debt 2019-12-30 01:21:47 +01:00
TheBusyBiscuit
b74479327a [CI skip] Reduced technical debt 2019-12-30 01:18:09 +01:00
TheBusyBiscuit
1c0e36f6f1 [CI skip] Optimized and refactored some android code 2019-12-30 01:01:09 +01:00
TheBusyBiscuit
a817903a04 [CI skip] Updated dependencies 2019-12-29 22:13:00 +01:00
TheBusyBiscuit
b8a94e22e5 [CI skip] Some refactoring 2019-12-29 18:30:48 +01:00
TheBusyBiscuit
e2d58f7f50 Several changes, won't list em all 2019-12-29 14:14:51 +01:00
TheBusyBiscuit
8db990f56c [CI skip] Fixed pages for main menu 2019-12-29 00:05:30 +01:00
TheBusyBiscuit
39292ae9ce Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-28 12:43:01 +01:00
TheBusyBiscuit
784ad0b195 Fixes #1295 2019-12-28 12:42:39 +01:00
AlexLander123
586437b16d Fix Basic Circuit Board not dropping 2019-12-28 14:35:39 +08:00
TheBusyBiscuit
8b3d1fedcb [CI skip] Minor tweaks 2019-12-27 16:43:23 +01:00
TheBusyBiscuit
9a3d79781b [CI skip] Reduced technical debt 2019-12-27 11:38:54 +01:00
TheBusyBiscuit
687e97f8e9 Minecraft recipe will now scroll through all available items (e.g. wood) 2019-12-27 11:10:22 +01:00
TheBusyBiscuit
2a06c2e215 Slimefun Guide now shows ALL minecraft recipes, with pages 2019-12-27 02:16:01 +01:00
TheBusyBiscuit
5dc19aedc3 [CI skip] Excluded github-actions from the contributors list 2019-12-26 23:30:28 +01:00
TheBusyBiscuit
3a19350323 Added Kelp Cookies (because why not?) 2019-12-26 21:26:04 +01:00
TheBusyBiscuit
336b26759a [CI skip] Some minor changes 2019-12-26 21:10:03 +01:00
TheBusyBiscuit
f7bfff2f37 Players can now toggle their research-fireworks in the guide 2019-12-26 21:01:51 +01:00
TheBusyBiscuit
d2ac50be38 Overhauled Guide Settings 2019-12-26 20:52:15 +01:00
TheBusyBiscuit
b7776e73b4 Minor performance improvement 2019-12-26 20:29:20 +01:00
TheBusyBiscuit
4efb53b705 Minor changes 2019-12-26 20:22:28 +01:00
TheBusyBiscuit
5933bc6367 Reduced technical debt 2019-12-26 19:56:58 +01:00
TheBusyBiscuit
249af4001b Fixes #1325 2019-12-26 19:49:53 +01:00
TheBusyBiscuit
7183350e1a Some code cleanup 2019-12-26 18:36:21 +01:00
TheBusyBiscuit
0efc51c7ea Fixed Category constructor 2019-12-26 18:30:40 +01:00
TheBusyBiscuit
129b98dff6 Lots of refactoring, implemented a suggestion 2019-12-23 20:38:55 +01:00
TheBusyBiscuit
bd610a9f94 Fixes #1298 2019-12-23 19:39:35 +01:00
TheBusyBiscuit
0e0859e73a [CI skip] Another minecraft alias 2019-12-23 00:39:03 +01:00
TheBusyBiscuit
2edf5db140 [CI skip] Added bverhoevens and BurningBrimstones minecraft alias 2019-12-22 23:51:43 +01:00
TheBusyBiscuit
b5dd2f329a [CI skip] Reduced technical debt, lots of refactoring 2019-12-22 23:00:05 +01:00
TheBusyBiscuit
5a0b994a4f Fixes #1318 2019-12-22 14:03:52 +01:00
TheBusyBiscuit
997c682a00 Refactoring + Allowed custom models for UI elements 2019-12-22 14:00:35 +01:00
coco0325
2ceb9d6d45 Update OilPump.java 2019-12-22 17:08:44 +08:00
coco0325
4d63bffc72 Update OilPump.java 2019-12-22 15:31:53 +08:00
coco0325
87b8035b34 Corrected OliPump.java 2019-12-22 01:46:56 +08:00
coco0325
ff0016ad0e Update OilPump.java 2019-12-22 01:32:20 +08:00
coco0325
2fd2dae403 Revert "TW-1" 
This reverts commit 687516cfae.
 2019-12-22 01:18:12 +08:00
coco0325
7d0d222f79 Update OilPump.java 2019-12-22 01:16:43 +08:00
coco0325
060051623d Merge remote-tracking branch 'upstream/master' 2019-12-22 01:08:49 +08:00
coco0325
687516cfae TW-1 2019-12-22 01:07:58 +08:00
TheBusyBiscuit
bee2375757 Removed Nether Drill (+ some micro-optimizations) 2019-12-21 16:46:17 +01:00
TheBusyBiscuit
c1ba8c02b3 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-21 15:42:29 +01:00
TheBusyBiscuit
429c280095 Fixes #1316 2019-12-21 15:42:07 +01:00
TheBusyBiscuit
6ef858a6ee
[CI skip] Merge pull request #1312 from pentabulge/master 
Added more wiki entries
 2019-12-19 23:42:45 +01:00
TheBusyBiscuit
a89b9ff467 [CI skip] Fine, I'll do it myself, Thanos said 2019-12-19 23:26:40 +01:00
TheBusyBiscuit
97d72e0a8d
[CI skip] Merge pull request #1294 from BurningBrimstone/master 
Added recipes
 2019-12-19 23:25:03 +01:00
TheBusyBiscuit
f9b12dfed5 [CI skip] Improved Cargo Performance a lot (breaks Barrels though) 2019-12-19 23:22:09 +01:00
penta
f9ef602982 Added more wiki entries 2019-12-18 19:40:03 +01:00
TheBusyBiscuit
f7fa6e2972 [CI skip] Reduced technical debt and tweaked Magnesium Salt 2019-12-18 01:07:04 +01:00
TheBusyBiscuit
331b9b64a7
[CI skip] Merge pull request #1310 from J3fftw1/feature/gravel-to-sand 
added a way to automate sand production
 2019-12-17 23:08:19 +01:00
J3fftw1
b1ae5c9047 added a way to automate sand production 2019-12-17 23:03:56 +01:00
TheBusyBiscuit
33adb7e79a Added Magnesium Salt and Magnesium-powered Generator 2019-12-17 01:37:09 +01:00
TheBusyBiscuit
59fb83e871 [CI skip] Removed CS-CoreLib Auto-Installer and reduced technical debt 2019-12-17 00:44:41 +01:00
TheBusyBiscuit
5730907da3
Merge pull request #1308 from creator3/master 
Fix drops in 1.15
 2019-12-17 00:19:10 +01:00
TheBusyBiscuit
989ed45a02 Added Salt to the GEO Miner (and reduced technical debt) 2019-12-17 00:18:04 +01:00
creator3
d698840e1f Use the actual tool item in calls to getDrops() 2019-12-16 11:47:47 -05:00
creator3
8b177df6c8 Fix drops in 1.15 2019-12-16 11:21:31 -05:00
penta
66b44f20df
Update wiki.json 2019-12-12 16:47:07 +01:00
penta
04a202d9a4
Added more wiki entries 2019-12-12 14:05:43 +01:00
TheBusyBiscuit
7268fb0505 [CI skip] Some more refactoring 2019-12-12 02:52:24 +01:00
TheBusyBiscuit
7cb0c521f6 [CI skip] Some refactoring 2019-12-12 01:45:55 +01:00
TheBusyBiscuit
aa9652cf88 Fixed Credits erroring for invalid usernames 2019-12-12 00:22:00 +01:00
TheBusyBiscuit
a91d926698 Re-formatted pom.xml 2019-12-12 00:20:01 +01:00
TheBusyBiscuit
db5f10ffe8 Fixed Credits + Reduced technical debt 2019-12-12 00:16:28 +01:00
TheBusyBiscuit
d66d34e85b
Merge branch 'master' into support/1.15 2019-12-11 23:15:33 +01:00
TheBusyBiscuit
3976e427a0 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-11 23:14:25 +01:00
TheBusyBiscuit
1ee411e4ca [CI skip] Reduced and Increased technical debt 2019-12-11 23:13:51 +01:00
Daniel Walsh
32be167679 Support 1.15 2019-12-11 16:41:00 +00:00
BurningBrimstone
642f5fe464
Added Ore Block Recipes 
Added following recipes to the electric press:
Diamond -> Diamond Block
Redstone -> Redstone Block
Lapis -> Lapis Block
Gold -> Gold Block
Iron -> Iron Block
 2019-12-11 00:56:19 -05:00
TheBusyBiscuit
460270f2a9
Merge pull request #1292 from SoSeDiK/kt 
Reworked & Fixed Knowledge Tome and a minor researching tweak
 2019-12-10 11:27:33 +01:00
TheBusyBiscuit
f74c078f61
Merge pull request #1293 from NihilistBrew/patch-1 
Grind andesite, granite, diorite to gravel
 2019-12-10 11:26:57 +01:00
TheBusyBiscuit
fd8a77dd79
Merge pull request #1288 from ramdon-person/patch-1 
Added Soulbound Trident
 2019-12-10 11:26:44 +01:00
TheBusyBiscuit
cdef18c8d7 [CI skip] Little improvement 2019-12-10 11:21:09 +01:00
TheBusyBiscuit
4c593760ba [CI skip] Some minor changes to metrics 2019-12-10 11:10:53 +01:00
TheBusyBiscuit
c8cc7818b2 [CI skip] Added two more contributor names, some refactoring 2019-12-10 11:00:04 +01:00
SoSeDiK
ac80575d8f Optimized item check 2019-12-10 09:55:56 +02:00
ramdon_person
052f80eeac
Update SlimefunSetup.java 2019-12-09 23:24:51 -08:00
BurningBrimstone
c879e5ebb7
Updated Quartz Namespace ID 
Changed NETHER_QUARTZ to QUARTZ.
 2019-12-09 13:19:09 -05:00
BurningBrimstone
60f16ee4ac
Added recipes 
Added recipes for iron and gold nuggets into their respective ingots. Also added a recipe for quartz into quartz blocks.

https://discordapp.com/channels/565557184348422174/627048923122499584/652563773793763343
 2019-12-09 12:40:51 -05:00
NihilistBrew
3d8add777a
Grind andesite, granite, diorite to gravel 
From https://discordapp.com/channels/565557184348422174/565569155848208404/650406015246008339
 2019-12-09 16:50:25 +01:00
TheBusyBiscuit
6c4c9cdc17 Some minor optimization 2019-12-09 09:52:49 +01:00
SoSeDiK
f0d04c75d8 Removed unnecessary action 2019-12-08 23:12:11 +02:00
SoSeDiK
27a8aa6236 Tweaked instant researching 
Don't start researching when it's instant, just throw fireworks & message about completion
 2019-12-08 22:55:17 +02:00
SoSeDiK
ce5ca5146e Reworked Knowledge Tome 2019-12-08 22:45:03 +02:00
SoSeDiK
912d2e9d7f
Fixed duplicate Grind Stone recipes 2019-12-08 17:44:02 +02:00
SoSeDiK
9b5bcfde44 Updated Crucible's mechanics 2019-12-08 15:24:22 +02:00
TheBusyBiscuit
ec44688459 Improved SlimefunItemStack#clone() 2019-12-08 13:09:15 +01:00
TheBusyBiscuit
8e72577974 Another optimization 2019-12-08 13:03:01 +01:00
TheBusyBiscuit
021bb3cbc8 Item optimizations 2019-12-08 12:59:55 +01:00
TheBusyBiscuit
39082938a8 Optimized items even further 2019-12-08 12:58:50 +01:00
TheBusyBiscuit
a22068b9ff Optimized SlimefunManager.isItemSimilar 2019-12-08 12:58:05 +01:00
TheBusyBiscuit
4699d6b94d [Ci skip] Another little change 2019-12-08 10:48:41 +01:00
TheBusyBiscuit
d12253c2f2 [Ci skip] Some small changes 2019-12-08 10:07:51 +01:00
TheBusyBiscuit
e5da69eb30
Merge pull request #1287 from WalshyDev/fix/contributors 
Allow for different GH and MC names + small improvements
 2019-12-08 09:31:06 +01:00
ramdon_person
17cf8cecdc
Update ResearchSetup.java 2019-12-07 12:30:38 -08:00
ramdon_person
c48cf894d4
Update SlimefunSetup.java 2019-12-07 11:56:11 -08:00
coder4321
4b8c948ad6
Update SlimefunSetup.java 2019-12-07 10:11:16 -08:00
coder4321
2281393a8b
Update SlimefunSetup.java 2019-12-07 10:09:50 -08:00
Daniel Walsh
f1ee2bd092 Added @NihilistBrew 2019-12-07 12:59:56 +00:00
coder4321
05f2751d58
Added Soulbound Trident 2019-12-07 01:25:34 -08:00
TheBusyBiscuit
72916b3e4f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-07 10:05:11 +01:00
TheBusyBiscuit
f25bf75d67 Added Nether Gold Pan to the Electric Gold Pan 2019-12-07 10:04:54 +01:00
coder4321
f90f1c609f [CI skip] Updated Teleport Sounds and Fixed The “color codes are supported text” for elevators (#1283) 
* Update TeleportationSequence.java

* Update TeleportationSequence.java

* Update Elevator.java
 2019-12-07 09:41:26 +01:00
Daniel Walsh
cafc78b3fe Revert 5b9e9a4fb7 2019-12-06 21:47:18 +00:00
Daniel Walsh
5b9e9a4fb7 *screams internally* 2019-12-06 21:45:06 +00:00
Daniel Walsh
9156d478ef Add ajan-12 and LinoxGH 2019-12-06 21:35:17 +00:00
Daniel Walsh
3f179f9eaa oops, revert dis 2019-12-06 21:03:56 +00:00
Daniel Walsh
724c550204 Pasting is a true gem 2019-12-06 20:57:17 +00:00
Daniel Walsh
73a9eddf7f Fixed up 
Now doesn't accept special chars and added imgbot
 2019-12-06 20:56:03 +00:00
Daniel Walsh
a112e43b42 Allow for different GH and MC names + small improvements 2019-12-06 20:08:20 +00:00
TheBusyBiscuit
a29016a391
[CI skip] Added more wiki entries 2019-12-06 14:41:01 +01:00
TheBusyBiscuit
bcbe16253e Search now shows the Category of an Item 2019-12-06 14:20:42 +01:00
TheBusyBiscuit
43033ec3a4
Fixes #1280 2019-12-06 08:39:43 +01:00
SoSeDiK
a294e0db1f
Fixes #1281 2019-12-04 17:57:38 +02:00
SoSeDiK
732ae5e0dc
Added a new constructor 
Allows using the new item system.
 2019-12-04 13:35:08 +02:00
TheBusyBiscuit
da1dd294f6 Fixed Output Chest 2019-12-04 00:04:34 +01:00
TheBusyBiscuit
0fd7892ca4 Fixed blocks turning into CSCoreLib heads for all newly placed 
non-ticking blocks.
 2019-12-03 20:20:33 +01:00
TheBusyBiscuit
ae2a75b1d1
[CI skip] Merge pull request #1263 from poma123/patch-1 
AndroidMineEvent
 2019-12-03 00:37:23 +01:00
J3fftw1
c2230f1763 fixes dupe with geominer 2019-12-02 23:14:22 +01:00
poma123
1ddd46768e Changed android getter & updated javadocs 2019-12-02 16:21:55 +01:00
J3fftw1
5e52a5d3ab actually fixes it now 
removed if (list.size() % 2 != 0) list.add(null);
 2019-12-02 15:58:33 +01:00
poma123
426dd64a2b Added android getter and some javadocs 2019-12-02 15:15:48 +01:00
TheBusyBiscuit
8183a1a5af Fixes #1269 2019-12-01 20:55:46 +01:00
TheBusyBiscuit
958a3c0429 Fixed IllegalArgumentException for second-page credits 2019-12-01 19:22:23 +01:00
TheBusyBiscuit
2c64adc536 [CI skip] Minor UI change 2019-12-01 19:18:02 +01:00
TheBusyBiscuit
4ffc2888fd Fixed credits now showing everyone 2019-12-01 19:16:27 +01:00
TheBusyBiscuit
78df2e3ea5 Added Electric Press 2019-12-01 19:08:32 +01:00
TheBusyBiscuit
15d1d708f6 Fixed guide showing incomplete recipes for some machines 2019-12-01 18:59:14 +01:00
TheBusyBiscuit
20cdda2845 Fixed multi tools again 2019-12-01 18:42:33 +01:00
TheBusyBiscuit
3a608cfe4f Fixed multi tools 2019-12-01 18:39:37 +01:00
TheBusyBiscuit
accb018b22 Reduced a bit more technical debt 2019-12-01 18:37:43 +01:00
TheBusyBiscuit
b4faad9a72 Reduced technical debt on MultiTools 2019-12-01 18:35:15 +01:00
TheBusyBiscuit
b5cc48fd9b Changed Grappling Hook Recipe 2019-12-01 18:24:52 +01:00
TheBusyBiscuit
135fe34221
Merge pull request #1275 from J3fftw1/fix/fix-guide-issue-reeee 
Fixes #1272 & #1273
 2019-12-01 16:58:02 +01:00
TheBusyBiscuit
51b347afe8 Changed a few category icons 2019-12-01 16:54:59 +01:00
TheBusyBiscuit
552c907f21 Fixed some christmas items 2019-12-01 16:54:50 +01:00
J3fftw1
90bcc2196c Fixes #1272 & #1273 2019-12-01 16:28:57 +01:00
TheBusyBiscuit
dbab114d8f Possibly fixes #1266 2019-11-30 01:00:24 +01:00
TheBusyBiscuit
ae74412fac Enhanced randomizer algorithm for Gold Pans 2019-11-30 00:58:35 +01:00
TheBusyBiscuit
41327d637c Added new API class 2019-11-30 00:44:44 +01:00
TheBusyBiscuit
d5482f5496 [CI skip] Some additional API work 2019-11-28 20:23:39 +01:00
TheBusyBiscuit
6312d6c431
Merge pull request #1270 from pentabulge/master 
Updated recipes for Automated Panning Machine
 2019-11-28 19:36:53 +01:00
TheBusyBiscuit
3a809ad5ab
Merge pull request #1268 from SoSeDiK/researches 
Changed loading order
 2019-11-28 19:36:38 +01:00
TheBusyBiscuit
015159dfe8 Fixes #1264 2019-11-28 19:35:28 +01:00
TheBusyBiscuit
95e5da325b Restructured a bit of the API (for future versions) 2019-11-28 19:34:43 +01:00
penta
ebe9375a80
Added Iron Nuggets & Soul Sand drops to recipes 2019-11-28 17:34:12 +01:00
poma123
19b604f1de Added javadocs to #getBlock 2019-11-27 17:39:08 +01:00
poma123
88f5d412e5 Event calling added into "movedig" 2019-11-27 17:35:58 +01:00
SoSeDiK
b39a08d557
Changed loading order 
Fixes researching not being enabled by default when starting the server for the first time
 2019-11-27 18:29:45 +02:00
SoSeDiK
f63c290041
Minor changes to formatting 
- Fixed color
- Removed empty lines
- Changed formatting according to the other pages in the guide
 2019-11-27 18:23:11 +02:00
poma123
b069f9c354 Added AndroidMineEvent 2019-11-26 22:46:00 +01:00
J3fftw1
eea32be7dd removed empty lines 2019-11-26 19:30:52 +01:00
J3fftw1
23202d1cd6 few more fixes 2019-11-26 19:29:13 +01:00
J3fftw1
80094b4f1b
Merge branch 'master' into qol/sf-version 2019-11-26 19:26:44 +01:00
J3fftw1
334a1058b4 merged latest master 2019-11-26 19:16:39 +01:00
J3fftw1
b220f3a39e added cscorelib version to the guide 2019-11-26 19:00:35 +01:00
TheBusyBiscuit
61a58d87dd Added Iron Nuggets to Gold Pan drops 2019-11-26 00:48:47 +01:00
TheBusyBiscuit
c9bd5840e0 Added Nether Gold Pan 2019-11-26 00:39:54 +01:00
TheBusyBiscuit
85227f0814
Merge pull request #1258 from NiekWilting/fix-titles 
Fixed the getTitle method.
 2019-11-24 14:28:10 +01:00
Niek Wilting
1f9cbc0b13 Fixed the getTitle method. 2019-11-24 14:11:34 +01:00
TheBusyBiscuit
0a44fa5671 Revamped Guide Settings Menu 2019-11-24 13:23:16 +01:00
TheBusyBiscuit
7ad4d92a14 [CI skip] Added Slimefun Guide and Recipe Types to custom item model 
service
 2019-11-22 14:57:04 +01:00
TheBusyBiscuit
8a605404c1 Added "Flint to Cobblestone" Recipe to the Compressor 2019-11-21 20:36:50 +01:00
TheBusyBiscuit
28ed785cf7
Merge pull request #1247 from J3fftw1/research/jerk 
added jerkys to research
 2019-11-17 21:31:44 +01:00
J3fftw1
1ac713cb58
Update ResearchSetup.java 2019-11-17 21:31:10 +01:00
TheBusyBiscuit
b1950447d6
Added more wiki pages to the guide 2019-11-17 21:30:39 +01:00
J3fftw1
f33218c10e
Update ResearchSetup.java 2019-11-17 21:29:59 +01:00
J3fftw1
8cb7108c27 reeeeeeeee sowwe 2019-11-17 18:49:06 +01:00
J3fftw1
a6129e65e9 fixed the tabs and changed jerky to jerky's 
crossing fingers for correct use of '
 2019-11-17 18:45:50 +01:00
J3fftw1
4b044cba16 fixed suggested changes 2019-11-17 18:26:54 +01:00
J3fftw1
152dcac0c7 fixed the changes SoSeDiK suggested/requested 2019-11-17 11:19:37 +01:00
J3fftw1
29543f4a2a changes 2019-11-16 23:48:30 +01:00
Daniel Walsh
1569f7e05e
Fix #1229 2019-11-16 22:06:26 +00:00
J3fftw1
4a83ecca07 added jerkys to research 2019-11-16 20:08:46 +01:00
TheBusyBiscuit
0a08690ae9
Merge pull request #1244 from poma123/patch-1 
AutoDisenchantEvent
 2019-11-16 17:47:32 +01:00
Poma123
87caf6ee45
Update AutoDisenchantEvent.java 2019-11-16 17:03:56 +01:00
Poma123
da0fe57ab7
Update AutoDisenchantEvent.java 2019-11-16 16:58:27 +01:00
Poma123
918d9c3506
Update AutoDisenchanter.java 2019-11-16 16:36:45 +01:00
Poma123
212b7cffd3
Update AutoDisenchantEvent.java 2019-11-16 16:35:22 +01:00
Poma123
72a7f4598f
Update and rename DisenchanterEvent.java to AutoDisenchantEvent.java 2019-11-16 16:34:14 +01:00
Poma123
201159f3bf
Update AutoDisenchanter.java 2019-11-16 16:29:59 +01:00
Poma123
537fc57f48
Update AutoDisenchanter.java 2019-11-16 16:27:15 +01:00
Poma123
d18adecb9a
Update DisenchanterEvent.java 2019-11-16 16:26:28 +01:00
Poma123
fa57e61447
Update AutoDisenchanter.java 2019-11-16 15:50:52 +01:00
Poma123
6f3bf2db13
Update DisenchanterEvent.java 2019-11-16 15:49:06 +01:00
Poma123
c6428c0e4b
Update AutoDisenchanter.java 2019-11-16 14:09:09 +01:00
Poma123
f0c0919bce
Add DisenchanterEvent 2019-11-16 14:08:38 +01:00
TheBusyBiscuit
fcf9b547c1
Merge pull request #1230 from SoSeDiK/transmitters 
Transmitters
 2019-11-16 14:08:22 +01:00
TheBusyBiscuit
09ab124e36 Added Output Chest support to the Table Saw 2019-11-10 20:18:06 +01:00
SoSeDiK
78c81bafdb
Merge branch 'master' into transmitters 2019-11-10 21:04:50 +02:00
TheBusyBiscuit
7890edd295 Added Output Chest Support to the Automated Panning Machine 2019-11-10 19:44:53 +01:00
TheBusyBiscuit
a10fe1e514 Fixed custom model data 2019-11-10 18:54:53 +01:00
TheBusyBiscuit
40616ee47e
Merge pull request #1239 from TheBusyBiscuit/custom-textures 
Added support for custom item models
 2019-11-10 18:52:36 +01:00
TheBusyBiscuit
97d8ce1546 Moved CoreProtect integration to CS-CoreLib2 2019-11-10 18:52:18 +01:00
TheBusyBiscuit
3e30ce8d14 Reduced technical debt 2019-11-10 18:43:37 +01:00
TheBusyBiscuit
2459469c9d Added support for custom item models 2019-11-10 17:46:18 +01:00
TheBusyBiscuit
2c7e155aa1 Added different kinds of Jerky to the Auto-Drier 2019-11-10 13:51:56 +01:00
TheBusyBiscuit
25f8566196
Merge pull request #1222 from AlexLander123/fixes 
Changed method of accessing reactor from access port
 2019-11-10 13:01:19 +01:00
TheBusyBiscuit
fc67fac34c [CI skip] Changed default version string 2019-11-10 13:01:07 +01:00
AlexLander123
c13ec9903c Ancient altar no longer able to craft items that are not unlocked 2019-11-06 02:17:52 +08:00
AlexLander123
9442fa65ca Fixed ancient alter logic 2019-11-06 00:56:03 +08:00
AlexLander123
e4efed0640 Made requested changes 
- Added null check
- Changed "a access port" to "the access port"
- Removed extra menu.open(p)
 2019-11-06 00:08:25 +08:00
SoSeDiK
2fb92c5083 Update GPSNetwork.java 2019-11-04 16:36:10 +02:00
SoSeDiK
0302810c9c Replaced double with int 2019-11-04 16:33:40 +02:00
SoSeDiK
09c02b7848 Fixed transmitter locations 2019-11-04 16:28:12 +02:00
TheBusyBiscuit
8895beb83a [CI skip] Minor refactoring 2019-11-03 23:43:11 +01:00
TheBusyBiscuit
57da6db9be Reduced technical debt and improved talisman performance 2019-11-03 21:32:44 +01:00
TheBusyBiscuit
a1e47d5ce0 Many bug fixes, many guide improvements 2019-11-03 20:36:46 +01:00
TheBusyBiscuit
27019c9ceb Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-11-03 20:28:35 +01:00
TheBusyBiscuit
6a1b6ffd92 Added support for ALL Vanilla Recipes (+ Faster Guide Responses) 2019-11-03 20:28:25 +01:00
Daniel Walsh
2febbe4d1c order 2019-11-03 19:05:32 +00:00
Daniel Walsh
d88291e215 Bring across repair cost in the disenchanter 2019-11-03 19:03:55 +00:00
TheBusyBiscuit
d86cb5e5b6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-11-03 19:23:39 +01:00
TheBusyBiscuit
fc6bd05b4f
[CI skip] Merge pull request #1223 from J3fftw1/good/fix/yes/yes 
Fixes
 2019-11-03 19:23:19 +01:00
TheBusyBiscuit
beebbda2dd Fixes #1224 2019-11-03 19:20:22 +01:00
TheBusyBiscuit
5c860cbfa4 Fixes #1226 2019-11-03 19:20:12 +01:00
J3fftw1
cade8df053 Fixes #1219 2019-10-31 16:24:27 +01:00
AlexLander123
6dd56e23f2 Changed method of accessing reactor from access port 
The change is made to stop inventory.no-access message when opening access port due to canOpen(Block, Player) returning false
 2019-10-31 22:01:53 +08:00
TheBusyBiscuit
05858309c5 [CI skip] Reduced technical debt 2019-10-29 09:13:32 +01:00
TheBusyBiscuit
7ba0eba4e9 Fixes #1211 2019-10-28 14:53:54 +01:00
AlexLander123
8601986c09 Allow reactors to take in fuel from access port 
- Also allow reactors to take in fuel in bulk
 2019-10-28 04:02:06 +08:00
TheBusyBiscuit
9f3c3a413b Some optimizations, also changed /sf timings to use floating point times 2019-10-27 20:07:12 +01:00
TheBusyBiscuit
e036e0f756 Fixes #1206 2019-10-27 14:18:31 +01:00
TheBusyBiscuit
bf4991264b Migrated more Items to the new System (+ Added auto-migration) 2019-10-27 14:38:39 +01:00
TheBusyBiscuit
57e1126553 Optimized and cleaned up guide 2019-10-20 16:41:28 +02:00
TheBusyBiscuit
1c12b892fe
Merge pull request #1203 from J3fftw1/veinminerfix 
fixes #1202
 2019-10-20 14:25:25 +02:00
J3fftw1
852b4bfc2a fixes #1202 2019-10-20 14:19:27 +02:00
TheBusyBiscuit
ad3ca513ad Fixed Multi Tools 2019-10-19 19:06:38 +02:00
TheBusyBiscuit
783a66d2da Fixed Food 2019-10-19 18:20:08 +02:00
TheBusyBiscuit
bb2d9d851f Fixes #1153 2019-10-19 18:18:17 +02:00
TheBusyBiscuit
41811b90f1 [CI skip] Added some documentation to the code 2019-10-19 16:48:22 +02:00
TheBusyBiscuit
a3bf63a023 More optimizations (+ Added more Jerky Meat) 2019-10-19 16:16:40 +02:00
TheBusyBiscuit
3eed8cebc6 Another fix 2019-10-19 15:15:11 +02:00
TheBusyBiscuit
70cc1d04f4 Fixes #1196 2019-10-19 15:14:05 +02:00
TheBusyBiscuit
c5341a6b02 Fixes #1196 2019-10-19 15:04:45 +02:00
TheBusyBiscuit
fc7c4e4d81 Fixed #1200 2019-10-19 12:53:13 +02:00
TheBusyBiscuit
260c3a51dd More code cleanup (+ Added Sweet Berries Organic Food/Fertilizer) 2019-10-19 10:30:15 +02:00
AlexLander123
1dc669740c Allow /sf cheat to have all categories unlocked 
- If the player who who is using /sf cheat have not unlocked the category, they will still have access to it
- Removed empty code
 2019-10-18 21:27:28 +08:00
J3fftw1
576b297b50 Fixed ExplosivePickaxe 2019-10-18 00:15:48 +02:00
J3fftw1
470f5f1afe fixed requested changes 2019-10-17 23:23:25 +02:00
J3fftw1
10fe7238ad fixed broken items 2019-10-17 23:14:43 +02:00
TheBusyBiscuit
06e3125a6d Repositioned back button for guide search 2019-10-17 01:33:49 +02:00
TheBusyBiscuit
f71b925a41 Improved Guide Search 2019-10-17 01:27:00 +02:00
TheBusyBiscuit
ee6dfae045 Fixed Guide Search's back button 2019-10-17 01:21:04 +02:00
TheBusyBiscuit
5fa021469f Added a logging message 2019-10-17 01:12:47 +02:00
TheBusyBiscuit
07827ecc53 Moved Guide History to Player Profiles 2019-10-17 01:08:14 +02:00
TheBusyBiscuit
45a688e148 Added wiki pages to the guide 2019-10-17 00:49:55 +02:00
TheBusyBiscuit
18b5bda4a8 [CI skip] Introduced proper Maven structure 2019-10-17 00:37:46 +02:00
TheBusyBiscuit
20e3f2b9ce Some more bug fixes and optimizations 2019-10-14 20:50:57 +02:00
TheBusyBiscuit
7e0eb29040 Minor optimization 2019-10-14 17:58:15 +02:00
TheBusyBiscuit
b2fd914cee Fixed Backpacks 2019-10-14 17:18:37 +02:00
TheBusyBiscuit
6865ab8c6c Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-10-14 17:18:08 +02:00
TheBusyBiscuit
fef43314f9 Fixed Backpacks not working 2019-10-14 17:17:50 +02:00
TheBusyBiscuit
fb652fe41d Another fix 2019-10-14 09:54:23 +02:00
TheBusyBiscuit
2a475811de Fixes #1180 (+ Improvements on MultiTool performance) 2019-10-14 09:31:14 +02:00
creator3
9551bf5a5c
Fix major BlockStorage performance regression 2019-10-13 19:01:00 -04:00
TheBusyBiscuit
090f45d93f
Merge pull request #1176 from WalshyDev/qol/improved-timings 
Order timings
 2019-10-13 19:05:16 +02:00
TheBusyBiscuit
005fbbdd13 Minor changes and optimizations 2019-10-13 19:05:04 +02:00
Daniel Walsh
d2e1dabf47 okie 2019-10-13 17:45:54 +01:00
TheBusyBiscuit
3239616f50 Hotfix 2 2019-10-13 18:44:59 +02:00
Daniel Walsh
8b4d927753 Fix NPE 2019-10-13 17:33:58 +01:00
Daniel Walsh
22a9f8955a Improve and also order console output 2019-10-13 17:32:42 +01:00