Commit graph

4897 commits

Author SHA1 Message Date
Justin Vitale
75e31a5d4f fix lock and optimize client-side sync for stored item 2020-07-09 01:03:12 +10:00
Justin Vitale
22fdd89e4c Uncomment the actual fix 2020-07-08 21:59:56 +10:00
Justin Vitale
95f68b1b7c Storage unit cleanup, optimization and fix displayed item 2020-07-08 21:59:09 +10:00
Justin Vitale
92eafec301 add Spearkiller's retextures 2020-07-08 21:15:53 +10:00
Justin Vitale
48bf8ae0f2 Have chance to yield two sap closes #2014 2020-07-08 19:43:19 +10:00
Justin Vitale
9ca7b491b0 Merge branch 'feature/sapper' into 1.16 2020-07-08 19:27:38 +10:00
Justin Vitale
e6e9b8bcfe Fix holding position, fix chat sending on server, drop sap if broken 2020-07-08 19:15:23 +10:00
Justin Vitale
80716876b2 Cleanup and drop when no log connected 2020-07-08 03:34:36 +10:00
Justin Vitale
7d04348853 Fix sound 2020-07-08 01:40:41 +10:00
Justin Vitale
cfefac1418 Put back original sap generation speed 2020-07-08 01:10:02 +10:00
Justin Vitale
856f66eeb0 Resin basin finished (Recipe, functionality, textures, models) 2020-07-08 01:06:34 +10:00
Justin Vitale
1c07084416 Merge branch '1.16' into feature/sapper 2020-07-07 19:07:44 +10:00
modmuss50
616f470532 Fix sulfur recipes 2020-07-06 17:31:28 +01:00
Justin Vitale
5985b5b6cb Random crash complaining about no sulfur_ores.json, add placeholder 2020-07-07 02:10:43 +10:00
Justin Vitale
bcfb8d3b02 fix storage unit bugs with locking closes #2155 2020-07-06 04:23:05 +10:00
Will Toll
852cd1c496
Create basic sulfur grinding recipes for compatibility with Cinderscapes (#2153)
* Create sulfur_dust_from_ore.json

* Create sulfur_dust.json
2020-07-05 00:14:56 +10:00
Justin Vitale
90c23b9d57 Refactor and cleanup, awaiting new model. 2020-07-02 17:20:50 +10:00
Justin Vitale
55fbcb712e Reference issue #2014 2020-07-02 02:38:51 +10:00
Justin Vitale
6dc00090d1 Add sapper base logic code (MVP) along with rest of it 2020-07-02 02:37:36 +10:00
Justin Vitale
b176230f77 Make drill break blocks slower when it's flat #2147 2020-07-02 01:13:01 +10:00
Justin Vitale
8335b932b4 Fix rubber door dupe closes #2149 2020-07-01 17:15:34 +10:00
modmuss50
ec20d3eb93 Dont use --refresh-dependencies on everybuild 2020-06-28 16:29:46 +01:00
modmuss50
4670d6813e Recipes 2020-06-28 16:25:17 +01:00
modmuss50
d92343f5a7 Add stair, slab and wall blocks for all metal storage blocks 2020-06-28 16:13:39 +01:00
modmuss50
4c400dd9a4 #releaseBuild 2020-06-24 17:33:41 +01:00
modmuss50
a7d68e63cb 1.16.1 2020-06-24 17:30:20 +01:00
Justin Vitale
f15d3bd8f7 Fix Nuke flying away when lit
Still reverts back to tnt texture when lit, don't know how to fix it.
2020-06-25 02:10:35 +10:00
Justin Vitale
608ee810f7 #betaBuild 2020-06-24 14:31:57 +10:00
Raul Tambre
b309635eaa
Fix crash opening GUIs on dedicated servers (#2139)
ExtendedClientHandlerFactory.create() is client-only.
Simply copy the relevant code into createMenu().

This is pretty terrible like the rest of the GUI code in GuiType.java, but this fixes the issue for now.

Fixes #2138.
2020-06-24 14:27:16 +10:00
modmuss50
07f06cb27a #releaseBuild 2020-06-21 13:55:39 +01:00
Justin Vitale
134152913f Tank/Storage unit stat squish 2020-06-20 00:02:04 +10:00
Justin Vitale
d230088e03 Remove ugly shadows from IN/OUT on units 2020-06-19 23:01:12 +10:00
Justin Vitale
c0f1e50ecd Remove everything related to depreciated digital & quantum chest + tank 2020-06-19 22:37:44 +10:00
modmuss50
f6e632f9d6 opps 2020-06-18 16:32:39 +01:00
modmuss50
6c20fa69bf Fix #2137 2020-06-18 16:13:47 +01:00
modmuss50
483c5f4724 Merge remote-tracking branch 'remotes/origin/screeenhandler_pr' into 1.16
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/GuiType.java
2020-06-18 16:08:59 +01:00
modmuss50
32468c1c95 Merge remote-tracking branch 'origin/1.16' into 1.16 2020-06-18 15:56:16 +01:00
modmuss50
7b297b5c45 1.16 Release Candidate 1 2020-06-18 15:55:30 +01:00
Justin Vitale
4d91f08279 Merge remote-tracking branch 'origin/1.16' into 1.16 2020-06-18 23:29:59 +10:00
Justin Vitale
5171cd30e8 Fix in/out position and translation for percent on storage/tank unit 2020-06-18 23:29:52 +10:00
modmuss50
14075b0409 Fix #2135 2020-06-18 13:50:56 +01:00
modmuss50
71a0a631ff remove usages of reflection, should help cut down on errors and IDE warnings. 2020-06-18 13:50:50 +01:00
modmuss50
dc72e5ce39 1.16-pre8 2020-06-18 13:49:38 +01:00
Justin Vitale
704dc06961 Import cleanup and reorganization 2020-06-18 22:41:34 +10:00
Justin Vitale
390d9f7059 Merge branch '1.15' into 1.16
Need to fix up storage unit UI
2020-06-18 22:39:26 +10:00
Justin Vitale
025740d8ee
Drain block for liquid gathering
https://wiki.techreborn.ovh/doku.php?id=mods:techreborn:drain
2020-06-18 21:39:40 +10:00
Justin Vitale
f915c4619d Fix typo in basalt recipe 2020-06-13 16:58:07 +10:00
Justin Vitale
62fb5f632a Cobblestone > Gravel > Sand grinder flow #2107
Don't see anything inherently wrong with this, most packs do it this way anyways.
2020-06-13 00:47:38 +10:00
Justin Vitale
f66e7019f9 Basalt, marble, andesite and granite craftable #2046
basalt from coal & obsidian small dust
marble from diorite dust an obsidian small dust
andesite dust from andesite
granite dust from granite (no longer makes quartz)
2020-06-13 00:36:45 +10:00
Justin Vitale
10dc7b114e Diorite dust from diorite blocks instead of quartz #2046
Quartz dust can be crafted via quartz in grinder
2020-06-13 00:10:51 +10:00