1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Commit Graph

1952 Commits

Author SHA1 Message Date
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
71eabf7d0b [CI skip] Updated dependencies 2020-01-25 23:37:44 +01: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
fc00a3a62d
[Ci skip] Updated README 2020-01-22 01:09:46 +01:00
TheBusyBiscuit
979ff0a191
[Ci skip] Updated README 2020-01-21 21:19:32 +01:00
TheBusyBiscuit
75c9743194
[CI skip] Updated README 2020-01-21 21:07:47 +01:00
TheBusyBiscuit
623e5a2f02 [CI skip] Refactored default-languages 2020-01-21 14:37:19 +01:00
TheBusyBiscuit
993cc7b6b8
[CI skip] Merge pull request #1377 from NihilistBrew/patch-2
Change typo
2020-01-19 15:14:30 +01:00
NihilistBrew
27086b4775
Change typo 2020-01-19 15:13:20 +01:00
TheBusyBiscuit
e072e6255b
[Ci skip] Merge pull request #1376 from NihilistBrew/patch-1
Additional formatting
2020-01-19 12:22:37 +01:00
NihilistBrew
fbf8907181
Additional formatting 2020-01-19 12:19:13 +01:00
TheBusyBiscuit
7a34455ce8
[CI skip] Merge pull request #1375 from NihilistBrew/NihilistBrew-patch-1
Normalize formatting of SlimefunSetup.java
2020-01-18 10:03:05 +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
1cda84fdb4
[ci skip] Merge pull request #1370 from TheBusyBiscuit/renovate/org.bstats-bstats-bukkit-1.x
Update dependency org.bstats:bstats-bukkit to v1.6
2020-01-12 22:54:59 +01:00
Renovate Bot
2192f1dbf7
Update dependency org.bstats:bstats-bukkit to v1.6 2020-01-12 21:52:08 +00: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
TheBusyBiscuit
ae8ec76315
[Ci skip] Merge pull request #1369 from J3fftw1/added/Prismarine-to-grindstone
Added prismarine to grindstone
2020-01-12 16:03:55 +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
TheBusyBiscuit
3a59d1b9fc
[CI skip] Merge pull request #1367 from svr333/patch-3
Update wiki.json
2020-01-12 13:07:04 +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