238 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
songoda	08589f5c63	Merge branch 'development'	2019-09-20 11:26:11 -04:00
songoda	c18eddac22	Added holograms to config and fixed storage system.	2019-09-20 11:25:25 -04:00
jascotty2	604f4c1e6e	fix missing command list	2019-09-12 08:59:44 -05:00
jascotty2	fd03365d97	fix overwriting data with previous state	2019-09-10 20:07:26 -05:00
jascotty2	09216ac604	manual merge	2019-09-10 19:57:12 -05:00
Brianna	72fd421774	Fixed name syncing.	2019-09-10 19:39:12 -04:00
Brianna	101819461d	furnace smoke doesn't fly	2019-09-10 19:16:53 -04:00
Brianna	679045bbad	Melting particles only show when something is actually melted.	2019-09-10 19:15:31 -04:00
jascotty2	6fbdca2036	furnace smoke doesn't fly	2019-09-10 17:59:22 -05:00
Brianna	e695be490b	probably should reload messages.	2019-09-10 14:10:41 -04:00
jascotty2	3db0cdae1a	add offset to hologram	2019-09-10 11:58:52 -05:00
Brianna	caa74578c9	Holograms are visible.	2019-09-10 12:57:06 -04:00
Brianna	f0069d35a1	Removed the unused because it never worked mysql system.	2019-09-10 12:41:01 -04:00
jascotty2	52aea1cf90	code cleanup	2019-09-10 09:52:40 -05:00
Brianna	b32cf44754	Added core	2019-09-09 19:27:49 -04:00
Brianna	7beffcc5cc	Weird swapped boolean.	2019-08-14 17:53:40 -04:00
Brianna	7a2ef6d601	version	2019-08-12 08:37:09 -04:00
Brianna	2b49007766	Merge remote-tracking branch 'origin/development' into development	2019-08-12 08:32:12 -04:00
Brianna	1825e5f39c	blast furnaces were not working correctly.	2019-08-12 08:32:10 -04:00
Lilac	30a89f52a0	Version.	2019-08-02 21:06:45 +01:00
Lilac	0bae953104	Fixed NPE	2019-08-02 20:54:22 +01:00
Brianna	c5f33cb340	Version	2019-07-20 10:04:45 -04:00
Brianna	af5d716987	Reserve Support.	2019-07-20 10:04:28 -04:00
Brianna	caab3afaa5	Version	2019-07-18 01:51:01 -04:00
Brianna	9c878d1472	line break.	2019-07-18 01:49:42 -04:00
Brianna	6c53061f61	Added Javadocs	2019-07-18 01:45:14 -04:00
Brianna	cc0d27e5cd	Didnt clone location which is a textbook total failure.	2019-07-18 01:45:14 -04:00
Brianna	2ad3d6b72e	Added proper placeholders and integrated prefix.	2019-07-18 00:05:27 -04:00
Brianna	afddbca954	Will now update outdated translations with English translations.	2019-07-17 20:03:10 -04:00
Brianna	c3d4879b6b	Overhauled Locale system.	2019-07-17 17:52:36 -04:00
Brianna	9b241f4114	Ooops	2019-07-15 15:11:12 -04:00
Brianna	bc7752f14e	Fixed modification exception.	2019-07-15 15:07:38 -04:00
Brianna	025e9beee3	cleaner	2019-07-14 21:57:39 -04:00
Brianna	fdf4f24e2e	Weird bug fix.	2019-07-14 20:42:41 -04:00
Brianna	7f7dc76b02	Version	2019-07-14 20:36:02 -04:00
Brianna	18523c71c4	Removed sync method from startup.	2019-07-14 20:12:38 -04:00
Brianna	a453499453	Added builder.	2019-07-14 19:37:46 -04:00
Brianna	4b3717145b	Fix for wrong furnace types in 1.14	2019-06-29 23:04:07 -04:00
Brianna	73635df738	Fixed issue with leveling up based on use not working.	2019-06-25 21:08:28 -04:00
Brianna	93acc9bd2c	Fix for showing the wrong prices in the upgrade menu.	2019-06-25 20:58:24 -04:00
Brianna	664e61579a	Don't load empty furnaces.	2019-06-19 11:48:32 -04:00
Brianna	4abff542f0	Version	2019-06-17 17:13:18 -04:00
Brianna	bf8e44ee63	Fix for null furnace level.	2019-06-17 17:10:49 -04:00
Brianna	8155fb6c97	Check if holograms are disabled.	2019-06-15 08:02:44 -04:00
Brianna	d6b10ddf31	Fix for chunk loading and type mismatch issues	2019-06-15 06:20:29 -04:00
Vrontis	b647083937	Update Locale.java | Fix for pseudo-empty lines in translation.	2019-06-13 16:33:34 -04:00
Brianna	8808eba35c	Lots of fixes.	2019-06-13 16:33:31 -04:00
Brianna O'Keefe	3b69ced1a7	Update .gitlab-ci.yml	2019-06-13 08:27:14 -04:00
Brianna	4f69cd4c92	Fix for 1.8 incompatibility in config.	2019-06-13 08:27:08 -04:00
Brianna	8abf0652d3	Not sure why this was split into another commit.	2019-06-13 06:40:56 -04:00