Commit graph

166 commits

Author SHA1 Message Date
modmuss50
31e7b357dc Use modern java features where we can, optimise imports. 2021-05-29 20:32:05 +01:00
modmuss50
b33f4be5f4 1.17: TechReborn compiles and runs, big thanks to @petabyteboy
Co-authored-by: Milan Pässler <milan@petabyte.dev>
2021-05-29 13:19:29 +01:00
modmuss50
9520a3e607 Migrate mappings, 1888 errors to go 2021-05-28 14:58:12 +01:00
modmuss50
2ea118ec63 Optimise Iron furnace recipe lookup 2020-12-20 21:24:05 +00:00
drcrazy
b460e0791e Tooltip refactoring 2020-11-10 18:38:25 +03:00
drcrazy
3645c156be Added translation for upgrades 2020-10-29 17:24:38 +03:00
drcrazy
3f0bd099d5 Fix drain container. Closes #2261 2020-10-27 15:23:08 +03:00
drcrazy
fef6d8f149 Added recipes for ancient debris. Closes #2254 2020-10-26 14:31:03 +03:00
drcrazy
75e7e626f9 Fix cells to tank drain. Closes #2239 2020-10-24 15:40:08 +03:00
drcrazy
342917851b Fix license 2020-10-21 01:37:31 +03:00
drcrazy
bf603744a5 Jackhammers can't break obsidan anymore. Closes #2235 2020-10-06 23:00:49 +03:00
drcrazy
742046095b Jackhammers can't break obsidan anymore. Closes #2235 2020-10-06 23:00:19 +03:00
modmuss50
19f7e17f7d 1.16.3 - just mappings 2020-09-19 14:30:12 +01:00
drcrazy
0b13213489 Jackhammers should have correct speed. Closes #2223, #2217 2020-09-16 03:21:12 +03:00
drcrazy
1360187f16 Creative tank will void excessive fluid. Closes #2205 2020-09-10 16:19:55 +03:00
modmuss50
6e0fc6af61 first pass on 1.16.2 - no world gen 2020-07-29 19:42:39 +01:00
modmuss50
ec1ae17134 Show a bounding box around all the blocks that are going to be broken.
Also fixes some slight issues.
2020-07-26 17:04:45 +01:00
drcrazy
90521007bb Small cleanup 2020-07-18 19:30:08 +03:00
Justin Vitale
c4ef977f16 Refactor and import cleanup (Excluding network PR changed files) 2020-07-09 23:04:42 +10: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
drcrazy
4e17c87ca4 Updated FabricBlockSettings 2020-06-09 17:02:06 +03:00
modmuss50
8051e0cfbb Fix some issues 2020-04-26 19:39:06 +01:00
modmuss50
71d88ae44a Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	src/main/java/techreborn/events/ModRegistry.java
2020-04-26 00:28:17 +01:00
modmuss50
047c57c918 fix license warnings 2020-04-26 00:22:24 +01:00
modmuss50
c2e74f070d Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	build.gradle
2020-04-11 15:40:23 +01:00
modmuss50
8b16fe191b Fix #2070 2020-04-11 14:51:02 +01:00
modmuss50
55f9a5df52 20w15a 2020-04-09 01:47:11 +01:00
modmuss50
4482c01ad0 Tag renames 2020-03-25 20:29:56 +00:00
modmuss50
e4fb1773f3 20w12a 2020-03-18 20:58:31 +00:00
drcrazy
416fbbf607 Allow to keep enchants only for TR items. Closes #1952 2020-03-10 13:51:34 +03:00
drcrazy
3e3ca8dd41 Enchants persist through crafting. Some work on #1952 2020-03-10 10:11:07 +03:00
drcrazy
a543a562b2 Fix industrial jackhammer AOE mining. Closes #1975 2020-01-14 02:22:06 +03:00
modmuss50
bc47a03451 Keep energy in items when crafting 2020-01-10 17:33:20 +00:00
drcrazy
a115fbd736 Dispenser can use cells. Closes #1948 2020-01-10 16:09:03 +03:00
drcrazy
8db5cea07c Refactoring for Scrapbox Dispenser behaviour. 2020-01-10 04:01:53 +03:00
drcrazy
525f956e0d BUff Industrial Jackhammer. Some work on #1944 2020-01-04 23:31:58 +03:00
Justin Vitale
9aeddd204a WIP tag to interface, capacity spacing fix, removed Supercondensator
Sidenote: Also renamed DocumentAssistUtils to ToolTipAssistUtils.
2020-01-04 14:20:57 +11:00
modmuss50
7b99e2e9b7 License updates + fixes 2020-01-03 22:46:07 +00:00
Justin Vitale
9328c47bed Tiered tank and storage blocks, GUI improvements, refactoring, cell nerf and misc organisation (#1932)
Tanks, storage blocks and variouse stuff. Thanks to Dimmerworld!!
2020-01-03 00:24:46 +03:00
modmuss50
de4c14542b Update to new reborn core 2020-01-01 15:58:16 +00:00
drcrazy
99b2342a1c Make JackHammer great again. 2019-12-25 03:39:46 +03:00
drcrazy
c4ecef5dcb Remove block moved to utils 2019-12-24 18:40:22 +03:00
drcrazy
0de4110f96 Check for energy in tools moved to RC. 2019-12-23 17:56:42 +03:00
Justin Vitale
3dbc7feb62 #1913 Improved in-game documentation via tooltips for both machines & upgrades and solar panel exception fix (#1917)
* Overclocker and energy storage tooltip added

* Add default constructor to fix NoSuchMethodException

java.lang.NoSuchMethodException when loading world with existing solar panels

* Base Upgrade tooltips (Might move to reborn core)

* Migrated to tooltip callback and added most machine infos

* Optimize imports of stuff previously touched

* Added more informationtips and cleanup

* Revert itemUpgrade formatting

* Final touches

* Readd easter eggs, multi-line tips and translation updates

Easter egg tooltips are now restricted to only ctrl-hover
2019-12-22 22:53:01 +00:00
modmuss50
e171d0eabc Remove duplicate annotations. 2019-12-13 10:00:59 +00:00
modmuss50
5e5e997b93 Move most int fluid values to FluidValue.
This has been done to make it easier in the future to move to a new fluid system.
Some work is still needed (in recipes mainly) to move away fully away from mb. This should work identically to the old system for now.
2019-12-12 12:42:33 +00:00
modmuss50
d5e89c5e20 Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/blocks/misc/BlockRubberLog.java
2019-11-14 19:03:36 +00:00
modmuss50
a984263b04 inital 19w46a port 2019-11-14 18:37:42 +00:00
modmuss50
39861db8b5 Fix #1874 2019-10-28 15:59:29 +00:00