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

1666 Commits

Author SHA1 Message Date
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
d5482f5496 [CI skip] Some additional API work 2019-11-28 20:23:39 +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
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
TheBusyBiscuit
823a1622b8
[CI skip] Merge pull request #1267 from SoSeDiK/page
Minor changes to formatting
2019-11-27 17:28:49 +01: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
TheBusyBiscuit
c6efbc7205
Merge pull request #1262 from J3fftw1/qol/sf-version
added cscorelib version to the guide
2019-11-26 23:42:14 +01:00
TheBusyBiscuit
2b133bbfa2
[CI skip] Updated issues comment bot 2019-11-26 23:25:31 +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
J3fftw1
b220f3a39e added cscorelib version to the guide 2019-11-26 19:00:35 +01:00
TheBusyBiscuit
61a58d87dd Added Iron Nuggets to Gold Pan drops 2019-11-26 00:48:47 +01:00
TheBusyBiscuit
c9bd5840e0 Added Nether Gold Pan 2019-11-26 00:39:54 +01:00
TheBusyBiscuit
85227f0814
Merge pull request #1258 from NiekWilting/fix-titles
Fixed the getTitle method.
2019-11-24 14:28:10 +01:00
Niek Wilting
1f9cbc0b13 Fixed the getTitle method. 2019-11-24 14:11:34 +01:00
TheBusyBiscuit
0a44fa5671 Revamped Guide Settings Menu 2019-11-24 13:23:16 +01:00
TheBusyBiscuit
7ad4d92a14 [CI skip] Added Slimefun Guide and Recipe Types to custom item model
service
2019-11-22 14:57:04 +01:00
TheBusyBiscuit
8a605404c1 Added "Flint to Cobblestone" Recipe to the Compressor 2019-11-21 20:36:50 +01:00
TheBusyBiscuit
62e67609f9
[Ci skip] Updated issues script 2019-11-19 22:35:29 +01:00
TheBusyBiscuit
a00cdbcfc2
[CI skip] Another test 2019-11-19 00:05:56 +01:00
TheBusyBiscuit
3266e4c65e
[CI skip] Added automated Issues responses 2019-11-19 00:01:21 +01:00
TheBusyBiscuit
ff8275797a
[Ci skip] Another test 2019-11-18 23:47:19 +01:00
TheBusyBiscuit
db865b85de
[CI skip] Testing something 2019-11-18 23:46:16 +01:00
TheBusyBiscuit
28ed785cf7
Merge pull request #1247 from J3fftw1/research/jerk
added jerkys to research
2019-11-17 21:31:44 +01:00
J3fftw1
1ac713cb58
Update ResearchSetup.java 2019-11-17 21:31:10 +01:00
TheBusyBiscuit
b1950447d6
Added more wiki pages to the guide 2019-11-17 21:30:39 +01:00
J3fftw1
f33218c10e
Update ResearchSetup.java 2019-11-17 21:29:59 +01:00
J3fftw1
8cb7108c27 reeeeeeeee sowwe 2019-11-17 18:49:06 +01:00
J3fftw1
a6129e65e9 fixed the tabs and changed jerky to jerky's
crossing fingers for correct use of '
2019-11-17 18:45:50 +01:00
J3fftw1
4b044cba16 fixed suggested changes 2019-11-17 18:26:54 +01:00
J3fftw1
152dcac0c7 fixed the changes SoSeDiK suggested/requested 2019-11-17 11:19:37 +01:00
J3fftw1
29543f4a2a changes 2019-11-16 23:48:30 +01:00
TheBusyBiscuit
c9b678f1a0
Merge pull request #1248 from WalshyDev/patch-2
Fix #1229
2019-11-16 23:11:36 +01:00
Daniel Walsh
1569f7e05e
Fix #1229 2019-11-16 22:06:26 +00:00
J3fftw1
4a83ecca07 added jerkys to research 2019-11-16 20:08:46 +01:00