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

376 Commits

Author SHA1 Message Date
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