1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 12:15:50 +00:00
Commit Graph

406 Commits

Author SHA1 Message Date
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
2869a654c9 [CI skip] More Refactoring 2020-02-23 00:59:55 +01:00
TheBusyBiscuit
dcd7146949 [CI skip] Some minor changes 2020-02-22 18:54:23 +01:00
TheBusyBiscuit
51d33dee02 [CI skip] Recipe Types can now be translated as well 2020-02-22 15:41:35 +01:00
TheBusyBiscuit
9ca20379a2 [Ci skip] Some more refactoring 2020-02-21 22:13:38 +01:00
TheBusyBiscuit
6175cff35a A Refactoring Supernova - You don't wanna look at the Diff 2020-02-21 21:22:26 +01:00
TheBusyBiscuit
f9f3e495e7 [CI skip] Refactoring 2020-02-21 12:09:12 +01:00
TheBusyBiscuit
155a9572c4 Fixed #1557 2020-02-21 11:00:41 +01:00
ThatPreston
c0af5eee77
Update SlimefunManager.java 2020-02-19 13:51:05 -06:00
TheBusyBiscuit
5e74657263 [CI skip] Changed the API a bit 2020-02-16 12:17:14 +01:00
TheBusyBiscuit
7d1e3b729e [CI skip] Updated change log 2020-02-14 10:49:45 +01:00
TheBusyBiscuit
0ff1311c32 [CI skip] Updated language files and reduced technical debt 2020-02-13 01:30:27 +01:00
TheBusyBiscuit
55b01b61f1 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-02-11 22:22:43 +01:00
TheBusyBiscuit
2cf5989d7a More cleanup and Refactoring 2020-02-11 22:22:33 +01:00
TheBusyBiscuit
92ab904a41
Merge pull request #1514 from StarWishsama/patch-1
Fixed can't back in setting opened by command
2020-02-11 21:16:34 +01:00
TheBusyBiscuit
17cf48a773 [CI skip] Fixes #1515 2020-02-11 21:16:09 +01:00
Nameless
302a059bf8
Fixed can't back in setting opened by command 2020-02-11 15:51:10 +08:00
TheBusyBiscuit
e3a02ea52d [CI skip] Updated /sf research 2020-02-10 18:00:14 +01:00
TheBusyBiscuit
b916c3636b [CI skip] A lot of internal cleanup, performance improvements 2020-02-10 12:42:34 +01:00
TheBusyBiscuit
e53746990e [CI skip] Reduced technical debt 2020-02-09 23:13:15 +01:00
TheBusyBiscuit
04709365a4 Finishing touches, new stable release incoming 2020-02-09 12:04:06 +01:00
TheBusyBiscuit
e0e46995af [Ci skip] Little fix 2020-02-09 11:15:34 +01:00
Nameless
6e34f86797 Give filled knowledge flask as SlimefunItem 2020-02-09 18:10:45 +08:00
TheBusyBiscuit
cefa85f451 [CI skip] Removed deprecated method 2020-02-09 00:30:31 +01:00
TheBusyBiscuit
be43f825a9 [Ci skip] Refactored Androids 2020-02-09 00:26:04 +01:00
TheBusyBiscuit
8b3b67e5c5 [CI skip] Removed deprecated method 2020-02-08 23:02:25 +01:00
TheBusyBiscuit
55cf5a1079 [Ci skip] Improved debugging and removed a deprecated class 2020-02-08 22:42:11 +01:00
TheBusyBiscuit
447683b600 [CI skip] Refactoring 2020-02-08 20:50:21 +01:00
NihilistBrew
5674570175 small formatting 2020-02-08 13:58:01 +01:00
TheBusyBiscuit
f68d110a43 [Ci skip] Minor design change 2020-02-08 02:55:49 +01:00
TheBusyBiscuit
5317c46b2f [CI skip] "a shit ton" may be an understatement 2020-02-08 02:36:57 +01:00
TheBusyBiscuit
ee695f8dee [Ci skip] Code improvements 2020-02-06 22:31:45 +01:00
TheBusyBiscuit
ccc1048eed [CI skip] A little bit refactoring 2020-02-06 20:38:32 +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
TheBusyBiscuit
916432c9ab [Ci skip] Added many more languages 2020-02-05 01:40:47 +01:00
TheBusyBiscuit
f0a3ccc43c [CI skip] Reduced technical debt, improved performance, refactoring 2020-02-04 19:05:49 +01:00
TheBusyBiscuit
c952ac6477 [Ci skip] Minor UI update 2020-02-04 00:53:30 +01: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
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
Daniel Walsh
99e8f5265a
Sync up cache stuff in BlockStorage 2020-02-02 16:01:47 +00:00
TheBusyBiscuit
21fe6b691a [Ci skip] Researches can now be translated 2020-02-02 16:11:18 +01:00
TheBusyBiscuit
ea3c95c92c Added 5 new languages; removed some old code 2020-02-01 09:57:38 +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
f0f3740a2c [CI skip] Minor refactoring 2020-01-31 09:47:04 +01:00
TheBusyBiscuit
761d52a9c6 Slimefun can now be translated (see wiki) 2020-01-30 22:03:17 +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
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
e49f7de412 Allowed MagicSugar to be placed on Altars. 2020-01-24 19:42:15 -08: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
8a267cad3e Fixes #1364 2020-01-12 13:14:41 +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
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
2dfb9ce92a Refined and refactored Localization code 2020-01-11 20:12:53 +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
c375384288 Removed Solar Array 2020-01-09 23:34:06 +01:00