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

194 Commits

Author SHA1 Message Date
TheBusyBiscuit
25d970ea94 Fixes #1971 2020-06-11 09:34:29 +02:00
TheBusyBiscuit
f58d6aeff4 Small performance improvement 2020-06-11 00:43:17 +02:00
TheBusyBiscuit
7acee959ce Lots of refactoring 2020-06-10 23:33:51 +02:00
TheBusyBiscuit
013696a759
Merge branch 'master' into feature/miner 2020-06-09 00:12:33 +02:00
TheBusyBiscuit
abe8afab67 More balancing for Organic Food/Fertilizer 2020-06-08 23:25:45 +02:00
TheBusyBiscuit
bd712472d5 Balancing changes to Organic Food/Fertilizer, added cocoa variant 2020-06-08 23:13:44 +02:00
TheBusyBiscuit
fb58b5cf33 Updated changelog 2020-06-05 14:14:13 +02:00
TheBusyBiscuit
c8f78379a1 Added Industrial Miner 2020-06-05 00:00:07 +02:00
TheBusyBiscuit
7e8a63bff8 Dried Kelp Blocks are now valid coal generator fuel 2020-06-04 15:26:35 +02:00
TheBusyBiscuit
595767ad03 Some cleanup 2020-06-02 13:50:29 +02:00
TheBusyBiscuit
0faaef9b25 Removed Digital Miners 2020-06-01 14:10:22 +02:00
TheBusyBiscuit
f65ac6b68c Lava can no longer be used as a coolant for reactors 2020-06-01 14:02:49 +02:00
TheBusyBiscuit
4bb81c0f5f Updated changelog 2020-05-31 00:38:19 +02:00
TheBusyBiscuit
c85b29c009 Fixes #1943 2020-05-30 16:21:13 +02:00
TheBusyBiscuit
343a18a95d Added dried Kelp and bone block recipes to the Electric Press 2020-05-30 13:36:48 +02:00
TheBusyBiscuit
d19da209d5 Fixes #1942 2020-05-29 16:07:02 +02:00
TheBusyBiscuit
efd9903ace [CI skip] Refactoring 2020-05-29 12:07:24 +02:00
TheBusyBiscuit
9ec316981c [CI skip] Updated README and changelog 2020-05-26 10:02:16 +02:00
TheBusyBiscuit
a34abcb1e7 Some refactoring, also fixes #1935 2020-05-24 20:19:22 +02:00
TheBusyBiscuit
f38c895780 [CI skip] Updated MockBukkit and re-enabled Deathpoint tests 2020-05-24 19:12:45 +02:00
TheBusyBiscuit
23c2ab0f65 Fixed custom player heads errors 2020-05-24 01:57:38 +02:00
TheBusyBiscuit
0af8c41eeb Added a toggle for #1924 and fixes #1933 2020-05-24 01:11:10 +02:00
TheBusyBiscuit
323ddc949b Fixes #1926 2020-05-23 20:34:37 +02:00
TheBusyBiscuit
69d32bd6f2 Fixes TheBusyBiscuit/ChestTerminal#25 2020-05-21 18:51:53 +02:00
TheBusyBiscuit
6eebb9c04d AncientAltar now has a speed variable 2020-05-17 00:40:07 +02:00
TheBusyBiscuit
dec22b9960 Added WaypointCreateEvent 2020-05-16 17:51:42 +02:00
TheBusyBiscuit
3a2cced5d0 Infused Magnets can no longer be placed down 2020-05-16 17:04:16 +02:00
TheBusyBiscuit
6a27bfd629 [CI skip] Updated the pom slightly 2020-05-16 16:12:30 +02:00
TheBusyBiscuit
29d2aaf055 Fixes #1914 2020-05-16 12:42:46 +02:00
TheBusyBiscuit
13b1a7f947 Fixed some weird head issues 2020-05-16 12:32:56 +02:00
TheBusyBiscuit
c4012fe697 [ci skip] Reduced mojang.com connection errors 2020-05-16 12:04:19 +02:00
TheBusyBiscuit
11383cad1d Fixes #1829 2020-05-15 17:45:13 +02:00
TheBusyBiscuit
6553aeb3e1 Fixes #1883 2020-05-15 16:57:47 +02:00
TheBusyBiscuit
c4a3cdc833 Fixed Organic food/fertilizer not being recognized 2020-05-15 16:47:01 +02:00
TheBusyBiscuit
741d18a8e8 Fixes #1903 2020-05-15 00:36:39 +02:00
TheBusyBiscuit
886121e226 Fixes #1908 2020-05-14 20:07:18 +02:00
TheBusyBiscuit
471a271518 Another one bites the Unit Tests 2020-05-12 00:50:01 +02:00
TheBusyBiscuit
ccad2982ab Fixes #1897 2020-05-10 21:37:24 +02:00
TheBusyBiscuit
eacbd2c5c1 Refactored Talismans a bit 2020-05-10 10:31:28 +02:00
TheBusyBiscuit
da95bb832d Fixes #1891 (actually fixed in a commit before the issue was posted) 2020-05-09 18:10:04 +02:00
TheBusyBiscuit
a2512ce03a Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into tests 2020-05-08 16:00:31 +02:00
TheBusyBiscuit
c3dbe8f34a Maybe fixed the Electric Smeltery recipe priorities 2020-05-08 15:54:14 +02:00
TheBusyBiscuit
a3afe615b5 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into tests 2020-05-07 20:39:42 +02:00
TheBusyBiscuit
528edc80d0 Fixes #1873 2020-05-07 20:38:51 +02:00
TheBusyBiscuit
220d5ef41f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into tests

Conflicts:
	CHANGELOG.md
2020-05-07 18:18:09 +02:00
TheBusyBiscuit
e95c5939a3 [CI skip] Added Ukrainian language 2020-05-04 21:21:01 +02:00
TheBusyBiscuit
0e58c3fa35 Added first Unit Tests 2020-05-04 16:25:47 +02:00
TheBusyBiscuit
3e2d1847ed Little performance improvement 2020-05-03 18:36:29 +02:00
TheBusyBiscuit
b9f22fbe2a [CI skip] Minor changes 2020-05-02 19:07:31 +02:00
TheBusyBiscuit
085d10be0a Maybe resolves #1834 2020-05-01 11:25:42 +02:00