1702 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ramdon_person	052f80eeac	Update SlimefunSetup.java	2019-12-09 23:24:51 -08: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
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
TheBusyBiscuit	a29016a391	[CI skip] Added more wiki entries	2019-12-06 14:41:01 +01: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
TheBusyBiscuit	95e70e5838	Merge pull request #1282 from SoSeDiK/mf ... Fixes #1281	2019-12-04 18:20:46 +01:00
SoSeDiK	a294e0db1f	Fixes #1281	2019-12-04 17:57:38 +02:00
TheBusyBiscuit	ac8d91810b	[CI skip] Merge pull request #1279 from SoSeDiK/hb ... Added a new constructor for HandledBlock	2019-12-04 12:42:51 +01: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
TheBusyBiscuit	df9315dd48	Merge pull request #1278 from J3fftw1/fix/fixes-actually-actually-fixes ... fixes dupe with geominer	2019-12-02 23:20:22 +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
TheBusyBiscuit	23d513943f	Merge pull request #1277 from J3fftw1/fix/fixes-1276 ... actually fixes it now	2019-12-02 16:01:50 +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	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
poma123	19b604f1de	Added javadocs to #getBlock	2019-11-27 17:39:08 +01:00