1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Commit Graph

2491 Commits

Author SHA1 Message Date
TheBusyBiscuit
106487b2e9
[CI skip] Merge pull request #1593 from WalshyDev/fix/performance-improvements
General performance improvements
2020-03-01 16:00:36 +01:00
Panda.com
7b74a347b6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into fix/performance-improvements
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GearListener.java
2020-03-01 15:52:36 +01:00
TheBusyBiscuit
9eda7d1e5e [CI skip] Refactoring 2020-03-01 15:23:09 +01:00
TheBusyBiscuit
c3f6eb3a3d [CI skip] More refactoring 2020-03-01 15:06:35 +01:00
Panda.com
56648c464f last fix! 2020-03-01 14:59:11 +01:00
TheBusyBiscuit
aaff35152a [CI skip] Refactored Slimefun guide 2020-03-01 14:49:00 +01:00
Panda.com
efa8d81f77 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into fix/performance-improvements
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TalismanListener.java
2020-03-01 14:33:44 +01:00
Panda.com
105b32583d Changed requested changes 2020-03-01 14:27:11 +01:00
TheBusyBiscuit
0609fa1b5f [CI skip] Added a warning for disabled auto-updaters. 2020-03-01 14:03:12 +01:00
TheBusyBiscuit
f007c1b68e [CI skip] Reduced technical debt 2020-03-01 10:36:31 +01:00
TheBusyBiscuit
c20f980710 Fixes #1597 2020-03-01 09:30:37 +01:00
TheBusyBiscuit
dad60f85c4 Fixes #1577 2020-03-01 09:29:37 +01:00
TheBusyBiscuit
b2a0214ef0 [CI skip] More cleanup 2020-03-01 01:05:48 +01:00
TheBusyBiscuit
cec1107198 [CI skip] A bunch of refactoring 2020-02-29 23:42:02 +01:00
Daniel Walsh
cbd7faf4d7 General performance improvements 2020-02-27 16:11:32 +00:00
TheBusyBiscuit
9b0cb78960
Merge pull request #1584 from ThatPreston/master
Add New Rainbow Blocks
2020-02-26 23:49:39 +01:00
TheBusyBiscuit
e079d32c27
[CI skip] Updated README 2020-02-26 23:49:10 +01:00
TheBusyBiscuit
37afdcd2d6
[CI skip] Updated changelog 2020-02-26 23:40:55 +01:00
ThatPreston
5549eb77b7
Remove Rainbow Concrete Powder 2020-02-26 15:23:06 -06:00
ThatPreston
0414cae04a
Remove Rainbow Concrete Powder 2020-02-26 15:21:45 -06:00
ThatPreston
2197b7eabd
Update ResearchSetup.java 2020-02-26 15:20:04 -06:00
TheBusyBiscuit
57bedbbcfe
[CI skip] Merge pull request #1585 from TheBusyBiscuit/gitlocalize-11043
Categories_es
2020-02-26 20:49:55 +01:00
TheBusyBiscuit
ccca0e03c7
[CI skip] Merge pull request #1587 from TheBusyBiscuit/gitlocalize-11045
recipes_es
2020-02-26 20:49:30 +01:00
TheBusyBiscuit
00a0b5bf5f
[CI skip] Merge pull request #1589 from TheBusyBiscuit/gitlocalize-11047
researches_es
2020-02-26 20:48:58 +01:00
TheBusyBiscuit
6c3c0fbbbc
[CI skip] Merge pull request #1588 from TheBusyBiscuit/gitlocalize-11046
messages_es
2020-02-26 20:48:14 +01:00
TheBusyBiscuit
dd0b979423
[CI skip] Merge pull request #1586 from TheBusyBiscuit/gitlocalize-11044
Resources_es
2020-02-26 20:47:39 +01:00
TheBusyBiscuit
d653733b6f
[CI skip] Merge pull request #1591 from TheBusyBiscuit/gitlocalize-11049
Updated Russian messages
2020-02-26 20:45:45 +01:00
SoSeDiK
5f653fe0e1 Translate messages_ru.yml via GitLocalize 2020-02-26 16:40:33 +00:00
TheBusyBiscuit
602ec46d28 Translate messages_ru.yml via GitLocalize 2020-02-26 16:40:32 +00:00
dbzjjoe
4fdef96b47 Translate researches_es.yml via GitLocalize 2020-02-26 16:00:35 +00:00
Vravinite
464bedc76d Translate researches_es.yml via GitLocalize 2020-02-26 16:00:34 +00:00
TheBusyBiscuit
5fe1c2a4c7 Translate messages_es.yml via GitLocalize 2020-02-26 15:58:08 +00:00
Luu7
ca425a5de9 Translate messages_es.yml via GitLocalize 2020-02-26 15:58:07 +00:00
Vravinite
c9e055a655 Translate messages_es.yml via GitLocalize 2020-02-26 15:58:06 +00:00
Vravinite
c46100c081 Translate recipes_es.yml via GitLocalize 2020-02-26 15:56:01 +00:00
Vravinite
f58b8ab43c Translate resources_es.yml via GitLocalize 2020-02-26 15:33:27 +00:00
Vravinite
73dad7020e Translate categories_es.yml via GitLocalize 2020-02-26 15:32:59 +00:00
ThatPreston
1e9dc2b85d
Added New Rainbow Blocks
Added rainbow concrete, concrete powder, and glazed terracotta to the rainbow blocks research group.
2020-02-25 18:38:45 -06:00
ThatPreston
d12f7b4b8e
Added New Rainbow Blocks
Added normal and seasonal variants of rainbow concrete, concrete powder, and glazed terracotta.
2020-02-25 18:36:53 -06:00
ThatPreston
4c8bb36c6a
Added New Seasonal Rainbow Blocks
Added Christmas, Halloween, and Valentine's Day variants of rainbow concrete, concrete powder, and glazed terracotta.
2020-02-25 18:15:14 -06:00
ThatPreston
ab1c9318a6
Add new Rainbow Blocks
Added Rainbow Concrete, Rainbow Concrete Powder, and Rainbow Glazed Terracotta
2020-02-25 17:53:28 -06:00
TheBusyBiscuit
6554a66e30
[CI skip] Merge pull request #1583 from TheBusyBiscuit/gitlocalize-11017
Updated hungarian
2020-02-24 21:22:58 +01:00
András Marczinkó
312eac4308 Translate recipes_hu.yml via GitLocalize 2020-02-24 20:22:27 +00:00
TheBusyBiscuit
6500badeeb Translate messages_hu.yml via GitLocalize 2020-02-24 20:22:24 +00:00
András Marczinkó
bf3ebc5768 Translate messages_hu.yml via GitLocalize 2020-02-24 20:22:23 +00:00
TheBusyBiscuit
e84aa3b223
[CI skip] Merge pull request #1582 from TheBusyBiscuit/gitlocalize-11011
Recipes - Slovak language
2020-02-24 11:57:18 +01:00
KillerXCoder
1d4f8ec7f2 Translate recipes_sk.yml via GitLocalize 2020-02-24 10:56:30 +00:00
TheBusyBiscuit
335b79e28e
[CI skip] Merge pull request #1581 from TheBusyBiscuit/gitlocalize-11010
Arabic Messages Translation Update
2020-02-24 10:18:54 +01:00
Muhammad Kamal Fergany
2b09c413c3 Translate messages_ar.yml via GitLocalize 2020-02-24 08:17:52 +00:00
TheBusyBiscuit
78a307c31c Translate messages_ar.yml via GitLocalize 2020-02-24 08:17:50 +00:00