modmuss50
|
3fe62e2c77
|
19w38b
|
2019-09-21 13:01:38 +01:00 |
|
modmuss50
|
2d8961589d
|
Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
# Conflicts:
# build.gradle
# src/main/java/techreborn/client/render/DynamicBucketBakedModel.java
# src/main/java/techreborn/client/render/DynamicCellBakedModel.java
|
2019-09-21 12:36:37 +01:00 |
|
modmuss50
|
7873670a4f
|
Remove some duplicate code
|
2019-09-15 14:09:20 +01:00 |
|
modmuss50
|
2f9b154e22
|
Move to RC's fluid instance, closes #1826
|
2019-09-15 13:59:46 +01:00 |
|
modmuss50
|
6e53132c59
|
Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
|
2019-09-12 16:55:52 +01:00 |
|
modmuss50
|
8c9c736da9
|
19w37a
|
2019-09-12 16:55:41 +01:00 |
|
modmuss50
|
0724c2017a
|
Cleanup / minor improvements to the chunk loader.
|
2019-08-30 18:12:17 +01:00 |
|
modmuss50
|
3f4e53e259
|
Made the chunkloader work
|
2019-08-30 17:53:46 +01:00 |
|
drcrazy
|
7c4564b5ab
|
Move common code for iron machines into abstract class
|
2019-08-30 14:26:23 +03:00 |
|
drcrazy
|
fbfa24b6ff
|
Iron furnace accumulates and drops experience. Closes #1817
|
2019-08-29 02:43:39 +03:00 |
|
drcrazy
|
528b868abe
|
Do not forget to call super in GUI init
|
2019-08-28 17:56:59 +03:00 |
|
drcrazy
|
2518c32c54
|
UpDown button refactoring
|
2019-08-28 15:40:42 +03:00 |
|
drcrazy
|
0d68f794ae
|
Iron furnace drops experience. Still need to save fuel time to tag
|
2019-08-28 02:46:56 +03:00 |
|
modmuss50
|
4a5fe76323
|
19w34a
|
2019-08-27 23:58:42 +01:00 |
|
drcrazy
|
09b59d6c87
|
Initial work on experience from smelting for #1817
|
2019-08-27 01:52:52 +03:00 |
|
drcrazy
|
6ceb6e69cf
|
Further refactoring of Iron machines
|
2019-08-26 23:31:56 +03:00 |
|
drcrazy
|
2cd8183c12
|
Facelift for chunkloader. Closes #1806
|
2019-08-24 01:41:40 +03:00 |
|
drcrazy
|
154dff4cbf
|
Unused imports + warnings )
|
2019-08-22 01:23:32 +03:00 |
|
modmuss50
|
49b42752a1
|
Fix some server crashes
|
2019-08-21 19:39:10 +01:00 |
|
modmuss50
|
7defc53242
|
Start on json based machine tile + guis
|
2019-08-20 17:40:31 +01:00 |
|
modmuss50
|
92b3bc6651
|
Possible solution for #1798
|
2019-08-20 16:44:25 +01:00 |
|
modmuss50
|
6114f45d9b
|
Cleanup + remove some TODO's that dont apply anymore
|
2019-08-20 15:15:26 +01:00 |
|
modmuss50
|
6174506d6c
|
Fix #1802
|
2019-08-20 15:06:09 +01:00 |
|
drcrazy
|
5bac19e302
|
tags for rolling machine + some REI polishing
|
2019-08-20 00:01:38 +03:00 |
|
modmuss50
|
a30e86b4cb
|
Minor cleanup
|
2019-08-19 20:09:07 +01:00 |
|
modmuss50
|
20517d4c32
|
Wire Mill
|
2019-08-19 19:51:05 +01:00 |
|
modmuss50
|
066d1bc9e2
|
Remove all awt usage
|
2019-08-19 14:40:02 +01:00 |
|
modmuss50
|
5511b598d7
|
Solid Canning Machine
|
2019-08-19 13:52:42 +01:00 |
|
modmuss50
|
0bcf782f57
|
Fix AESU and Fusion control buttons
|
2019-08-18 15:54:25 +01:00 |
|
modmuss50
|
926063ffcf
|
Fix manual gui. Closes #1792
|
2019-08-18 15:23:24 +01:00 |
|
drcrazy
|
3e5965ad57
|
Fix progress bar for electric furnace
|
2019-08-15 21:14:42 +03:00 |
|
drcrazy
|
9035e4376a
|
Fix for #1782, cheap basic tools and fixed some warnings here and there
|
2019-08-14 17:15:34 +03:00 |
|
drcrazy
|
1f9bfabf21
|
Removed unused imports
|
2019-08-12 22:04:24 +03:00 |
|
modmuss50
|
77eee6f5b4
|
Move configs to one class
|
2019-08-12 17:57:00 +01:00 |
|
drcrazy
|
4012a69fab
|
Fix Iron Furnace GUI
|
2019-08-11 23:56:43 +03:00 |
|
modmuss50
|
2415040add
|
Fix sawmill hologram offset. Closes #1750
|
2019-08-08 13:30:24 +01:00 |
|
modmuss50
|
a08ee3d17a
|
Fix manual crashing the game, closes #1754
|
2019-08-08 11:49:11 +01:00 |
|
modmuss50
|
02c823986a
|
Fix optifine crash, still some incompatibilities with shaders. Closes #1749
|
2019-08-08 11:33:12 +01:00 |
|
Prospector
|
78cbf9a2ac
|
Dynamic bucket textures
|
2019-07-31 16:13:03 -07:00 |
|
modmuss50
|
739f4c21e8
|
Fix multiplayer crashes
|
2019-07-31 17:34:53 +01:00 |
|
Prospector
|
711c95c58e
|
Merge remote-tracking branch 'origin/1.14' into 1.14
|
2019-07-30 23:35:02 -07:00 |
|
Prospector
|
78b72795c6
|
Fix cell rendering (blessed Grondag for helping immensely)
|
2019-07-30 23:34:51 -07:00 |
|
drcrazy
|
5406d08f5d
|
Cleanup and warnings
|
2019-07-31 02:41:54 +03:00 |
|
modmuss50
|
5e19889c96
|
Some hologram changes, the button wont work.
|
2019-07-29 15:22:48 +01:00 |
|
drcrazy
|
13ed4d1c22
|
Typo and license
|
2019-07-29 17:18:52 +03:00 |
|
modmuss50
|
b89a52e594
|
Fluid color in cell changes color based on biome's water color + some other fixes and changes
|
2019-07-28 17:29:01 +01:00 |
|
modmuss50
|
0da3168bbf
|
Fluid ingredients + some other work around this area
|
2019-07-28 17:14:38 +01:00 |
|
modmuss50
|
6a93c3fd46
|
more misc fluid work, gonna leave most of this untill we have an offical or new api
|
2019-07-24 19:06:21 +01:00 |
|
modmuss50
|
8964c5aceb
|
Basic Dynamic cell rendering
|
2019-07-24 01:37:05 +01:00 |
|
modmuss50
|
9b46e3237e
|
move to silk fluids
|
2019-07-23 21:30:57 +01:00 |
|