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
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
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
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
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
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
SoSeDiK
912d2e9d7f
Fixed duplicate Grind Stone recipes
2019-12-08 17:44:02 +02:00
SoSeDiK
9b5bcfde44
Updated Crucible's mechanics
2019-12-08 15:24:22 +02:00
TheBusyBiscuit
ec44688459
Improved SlimefunItemStack#clone()
2019-12-08 13:09:15 +01:00
TheBusyBiscuit
8e72577974
Another optimization
2019-12-08 13:03:01 +01:00
TheBusyBiscuit
021bb3cbc8
Item optimizations
2019-12-08 12:59:55 +01:00
TheBusyBiscuit
39082938a8
Optimized items even further
2019-12-08 12:58:50 +01:00
TheBusyBiscuit
a22068b9ff
Optimized SlimefunManager.isItemSimilar
2019-12-08 12:58:05 +01:00
TheBusyBiscuit
4699d6b94d
[Ci skip] Another little change
2019-12-08 10:48:41 +01:00
TheBusyBiscuit
d12253c2f2
[Ci skip] Some small changes
2019-12-08 10:07:51 +01:00
TheBusyBiscuit
e5da69eb30
Merge pull request #1287 from WalshyDev/fix/contributors
...
Allow for different GH and MC names + small improvements
2019-12-08 09:31:06 +01:00
ramdon_person
17cf8cecdc
Update ResearchSetup.java
2019-12-07 12:30:38 -08:00
ramdon_person
c48cf894d4
Update SlimefunSetup.java
2019-12-07 11:56:11 -08:00
coder4321
4b8c948ad6
Update SlimefunSetup.java
2019-12-07 10:11:16 -08:00
coder4321
2281393a8b
Update SlimefunSetup.java
2019-12-07 10:09:50 -08:00
Daniel Walsh
f1ee2bd092
Added @NihilistBrew
2019-12-07 12:59:56 +00:00
coder4321
05f2751d58
Added Soulbound Trident
2019-12-07 01:25:34 -08:00
TheBusyBiscuit
72916b3e4f
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
2019-12-07 10:05:11 +01:00
TheBusyBiscuit
f25bf75d67
Added Nether Gold Pan to the Electric Gold Pan
2019-12-07 10:04:54 +01:00
coder4321
f90f1c609f
[CI skip] Updated Teleport Sounds and Fixed The “color codes are supported text” for elevators ( #1283 )
...
* Update TeleportationSequence.java
* Update TeleportationSequence.java
* Update Elevator.java
2019-12-07 09:41:26 +01:00
Daniel Walsh
cafc78b3fe
Revert 5b9e9a4fb7
2019-12-06 21:47:18 +00:00
Daniel Walsh
5b9e9a4fb7
*screams internally*
2019-12-06 21:45:06 +00:00
Daniel Walsh
9156d478ef
Add ajan-12 and LinoxGH
2019-12-06 21:35:17 +00:00
Daniel Walsh
3f179f9eaa
oops, revert dis
2019-12-06 21:03:56 +00:00
Daniel Walsh
724c550204
Pasting is a true gem
2019-12-06 20:57:17 +00:00
Daniel Walsh
73a9eddf7f
Fixed up
...
Now doesn't accept special chars and added imgbot
2019-12-06 20:56:03 +00:00
Daniel Walsh
a112e43b42
Allow for different GH and MC names + small improvements
2019-12-06 20:08:20 +00:00
TheBusyBiscuit
bcbe16253e
Search now shows the Category of an Item
2019-12-06 14:20:42 +01:00
TheBusyBiscuit
43033ec3a4
Fixes #1280
2019-12-06 08:39:43 +01:00
SoSeDiK
a294e0db1f
Fixes #1281
2019-12-04 17:57:38 +02:00
SoSeDiK
732ae5e0dc
Added a new constructor
...
Allows using the new item system.
2019-12-04 13:35:08 +02:00
TheBusyBiscuit
da1dd294f6
Fixed Output Chest
2019-12-04 00:04:34 +01:00
TheBusyBiscuit
0fd7892ca4
Fixed blocks turning into CSCoreLib heads for all newly placed
...
non-ticking blocks.
2019-12-03 20:20:33 +01:00
TheBusyBiscuit
ae2a75b1d1
[CI skip] Merge pull request #1263 from poma123/patch-1
...
AndroidMineEvent
2019-12-03 00:37:23 +01:00
J3fftw1
c2230f1763
fixes dupe with geominer
2019-12-02 23:14:22 +01:00
poma123
1ddd46768e
Changed android getter & updated javadocs
2019-12-02 16:21:55 +01:00
J3fftw1
5e52a5d3ab
actually fixes it now
...
removed if (list.size() % 2 != 0) list.add(null);
2019-12-02 15:58:33 +01:00
poma123
426dd64a2b
Added android getter and some javadocs
2019-12-02 15:15:48 +01:00
TheBusyBiscuit
8183a1a5af
Fixes #1269
2019-12-01 20:55:46 +01:00
TheBusyBiscuit
958a3c0429
Fixed IllegalArgumentException for second-page credits
2019-12-01 19:22:23 +01:00
TheBusyBiscuit
2c64adc536
[CI skip] Minor UI change
2019-12-01 19:18:02 +01:00
TheBusyBiscuit
4ffc2888fd
Fixed credits now showing everyone
2019-12-01 19:16:27 +01:00
TheBusyBiscuit
78df2e3ea5
Added Electric Press
2019-12-01 19:08:32 +01:00
TheBusyBiscuit
15d1d708f6
Fixed guide showing incomplete recipes for some machines
2019-12-01 18:59:14 +01:00
TheBusyBiscuit
20cdda2845
Fixed multi tools again
2019-12-01 18:42:33 +01:00
TheBusyBiscuit
3a608cfe4f
Fixed multi tools
2019-12-01 18:39:37 +01:00
TheBusyBiscuit
accb018b22
Reduced a bit more technical debt
2019-12-01 18:37:43 +01:00
TheBusyBiscuit
b4faad9a72
Reduced technical debt on MultiTools
2019-12-01 18:35:15 +01:00
TheBusyBiscuit
b5cc48fd9b
Changed Grappling Hook Recipe
2019-12-01 18:24:52 +01:00
TheBusyBiscuit
135fe34221
Merge pull request #1275 from J3fftw1/fix/fix-guide-issue-reeee
...
Fixes #1272 & #1273
2019-12-01 16:58:02 +01:00
TheBusyBiscuit
51b347afe8
Changed a few category icons
2019-12-01 16:54:59 +01:00
TheBusyBiscuit
552c907f21
Fixed some christmas items
2019-12-01 16:54:50 +01:00
J3fftw1
90bcc2196c
Fixes #1272 & #1273
2019-12-01 16:28:57 +01:00
TheBusyBiscuit
dbab114d8f
Possibly fixes #1266
2019-11-30 01:00:24 +01:00
TheBusyBiscuit
ae74412fac
Enhanced randomizer algorithm for Gold Pans
2019-11-30 00:58:35 +01:00
TheBusyBiscuit
41327d637c
Added new API class
2019-11-30 00:44:44 +01:00
TheBusyBiscuit
6312d6c431
Merge pull request #1270 from pentabulge/master
...
Updated recipes for Automated Panning Machine
2019-11-28 19:36:53 +01:00
TheBusyBiscuit
3a809ad5ab
Merge pull request #1268 from SoSeDiK/researches
...
Changed loading order
2019-11-28 19:36:38 +01:00
TheBusyBiscuit
015159dfe8
Fixes #1264
2019-11-28 19:35:28 +01:00
TheBusyBiscuit
95e5da325b
Restructured a bit of the API (for future versions)
2019-11-28 19:34:43 +01:00
penta
ebe9375a80
Added Iron Nuggets & Soul Sand drops to recipes
2019-11-28 17:34:12 +01:00
poma123
19b604f1de
Added javadocs to #getBlock
2019-11-27 17:39:08 +01:00
poma123
88f5d412e5
Event calling added into "movedig"
2019-11-27 17:35:58 +01:00
SoSeDiK
b39a08d557
Changed loading order
...
Fixes researching not being enabled by default when starting the server for the first time
2019-11-27 18:29:45 +02:00
SoSeDiK
f63c290041
Minor changes to formatting
...
- Fixed color
- Removed empty lines
- Changed formatting according to the other pages in the guide
2019-11-27 18:23:11 +02:00
poma123
b069f9c354
Added AndroidMineEvent
2019-11-26 22:46:00 +01:00
J3fftw1
eea32be7dd
removed empty lines
2019-11-26 19:30:52 +01:00
J3fftw1
23202d1cd6
few more fixes
2019-11-26 19:29:13 +01:00
J3fftw1
80094b4f1b
Merge branch 'master' into qol/sf-version
2019-11-26 19:26:44 +01:00
J3fftw1
334a1058b4
merged latest master
2019-11-26 19:16:39 +01:00