TheBusyBiscuit
6ef858a6ee
[CI skip] Merge pull request #1312 from pentabulge/master
...
Added more wiki entries
2019-12-19 23:42:45 +01:00
TheBusyBiscuit
a89b9ff467
[CI skip] Fine, I'll do it myself, Thanos said
2019-12-19 23:26:40 +01:00
TheBusyBiscuit
97d72e0a8d
[CI skip] Merge pull request #1294 from BurningBrimstone/master
...
Added recipes
2019-12-19 23:25:03 +01:00
TheBusyBiscuit
f9b12dfed5
[CI skip] Improved Cargo Performance a lot (breaks Barrels though)
2019-12-19 23:22:09 +01:00
penta
f9ef602982
Added more wiki entries
2019-12-18 19:40:03 +01:00
penta
e41b2762f0
Merge pull request #2 from TheBusyBiscuit/master
...
Sync
2019-12-18 13:31:42 +01:00
TheBusyBiscuit
f7fa6e2972
[CI skip] Reduced technical debt and tweaked Magnesium Salt
2019-12-18 01:07:04 +01:00
TheBusyBiscuit
331b9b64a7
[CI skip] Merge pull request #1310 from J3fftw1/feature/gravel-to-sand
...
added a way to automate sand production
2019-12-17 23:08:19 +01:00
J3fftw1
b1ae5c9047
added a way to automate sand production
2019-12-17 23:03:56 +01:00
TheBusyBiscuit
33adb7e79a
Added Magnesium Salt and Magnesium-powered Generator
2019-12-17 01:37:09 +01:00
TheBusyBiscuit
59fb83e871
[CI skip] Removed CS-CoreLib Auto-Installer and reduced technical debt
2019-12-17 00:44:41 +01:00
TheBusyBiscuit
5730907da3
Merge pull request #1308 from creator3/master
...
Fix drops in 1.15
2019-12-17 00:19:10 +01:00
TheBusyBiscuit
989ed45a02
Added Salt to the GEO Miner (and reduced technical debt)
2019-12-17 00:18:04 +01:00
creator3
d698840e1f
Use the actual tool item in calls to getDrops()
2019-12-16 11:47:47 -05:00
creator3
8b177df6c8
Fix drops in 1.15
2019-12-16 11:21:31 -05:00
TheBusyBiscuit
f6057bf24d
[CI skip] Merge pull request #1302 from pentabulge/master
...
Added more wiki entries
2019-12-12 20:01:14 +01:00
penta
66b44f20df
Update wiki.json
2019-12-12 16:47:07 +01:00
penta
04a202d9a4
Added more wiki entries
2019-12-12 14:05:43 +01:00
penta
57a861b235
Merge pull request #1 from TheBusyBiscuit/master
...
Update
2019-12-12 13:38:32 +01:00
TheBusyBiscuit
7268fb0505
[CI skip] Some more refactoring
2019-12-12 02:52:24 +01:00
TheBusyBiscuit
7cb0c521f6
[CI skip] Some refactoring
2019-12-12 01:45:55 +01:00
TheBusyBiscuit
aa9652cf88
Fixed Credits erroring for invalid usernames
2019-12-12 00:22:00 +01:00
TheBusyBiscuit
a91d926698
Re-formatted pom.xml
2019-12-12 00:20:01 +01:00
TheBusyBiscuit
db5f10ffe8
Fixed Credits + Reduced technical debt
2019-12-12 00:16:28 +01:00
TheBusyBiscuit
c559c8fe29
Merge pull request #1300 from WalshyDev/support/1.15
...
Support 1.15
2019-12-11 23:15:40 +01:00
TheBusyBiscuit
d66d34e85b
Merge branch 'master' into support/1.15
2019-12-11 23:15:33 +01:00
TheBusyBiscuit
3976e427a0
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
2019-12-11 23:14:25 +01:00
TheBusyBiscuit
1ee411e4ca
[CI skip] Reduced and Increased technical debt
2019-12-11 23:13:51 +01:00
Daniel Walsh
5d3336ed9f
OOPS you saw nothing!
2019-12-11 21:42:31 +00:00
Daniel Walsh
3fe5d7c5d6
Update to CS-CoreLib supported 1.15 build
2019-12-11 21:39:37 +00:00
Daniel Walsh
32be167679
Support 1.15
2019-12-11 16:41:00 +00:00
BurningBrimstone
642f5fe464
Added Ore Block Recipes
...
Added following recipes to the electric press:
Diamond -> Diamond Block
Redstone -> Redstone Block
Lapis -> Lapis Block
Gold -> Gold Block
Iron -> Iron Block
2019-12-11 00:56:19 -05:00
TheBusyBiscuit
460270f2a9
Merge pull request #1292 from SoSeDiK/kt
...
Reworked & Fixed Knowledge Tome and a minor researching tweak
2019-12-10 11:27:33 +01:00
TheBusyBiscuit
f74c078f61
Merge pull request #1293 from NihilistBrew/patch-1
...
Grind andesite, granite, diorite to gravel
2019-12-10 11:26:57 +01:00
TheBusyBiscuit
fd8a77dd79
Merge pull request #1288 from ramdon-person/patch-1
...
Added Soulbound Trident
2019-12-10 11:26:44 +01:00
TheBusyBiscuit
cdef18c8d7
[CI skip] Little improvement
2019-12-10 11:21:09 +01:00
TheBusyBiscuit
4c593760ba
[CI skip] Some minor changes to metrics
2019-12-10 11:10:53 +01:00
TheBusyBiscuit
c8cc7818b2
[CI skip] Added two more contributor names, some refactoring
2019-12-10 11:00:04 +01:00
SoSeDiK
ac80575d8f
Optimized item check
2019-12-10 09:55:56 +02:00
ramdon_person
052f80eeac
Update SlimefunSetup.java
2019-12-09 23:24:51 -08:00
BurningBrimstone
c879e5ebb7
Updated Quartz Namespace ID
...
Changed NETHER_QUARTZ to QUARTZ.
2019-12-09 13:19:09 -05:00
BurningBrimstone
60f16ee4ac
Added recipes
...
Added recipes for iron and gold nuggets into their respective ingots. Also added a recipe for quartz into quartz blocks.
https://discordapp.com/channels/565557184348422174/627048923122499584/652563773793763343
2019-12-09 12:40:51 -05:00
NihilistBrew
3d8add777a
Grind andesite, granite, diorite to gravel
...
From https://discordapp.com/channels/565557184348422174/565569155848208404/650406015246008339
2019-12-09 16:50:25 +01:00
TheBusyBiscuit
a5e80923c1
[CI skip] Yet another test
2019-12-09 10:30:21 +01:00
TheBusyBiscuit
a82df4f9bd
[CI skip] Another test
2019-12-09 10:26:40 +01:00
TheBusyBiscuit
6c4c9cdc17
Some minor optimization
2019-12-09 09:52:49 +01:00
SoSeDiK
f0d04c75d8
Removed unnecessary action
2019-12-08 23:12:11 +02:00
SoSeDiK
27a8aa6236
Tweaked instant researching
...
Don't start researching when it's instant, just throw fireworks & message about completion
2019-12-08 22:55:17 +02:00
SoSeDiK
ce5ca5146e
Reworked Knowledge Tome
2019-12-08 22:45:03 +02:00
TheBusyBiscuit
60e7f8dc1d
[CI skip] Finally
2019-12-08 20:58:43 +01:00
