Commit graph

710 commits

Author SHA1 Message Date
Justin Vitale
c4ef977f16 Refactor and import cleanup (Excluding network PR changed files) 2020-07-09 23:04:42 +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
704dc06961 Import cleanup and reorganization 2020-06-18 22:41:34 +10:00
modmuss50
ffc4c1643e 1.16-pre2 2020-06-05 16:03:22 +01:00
modmuss50
ae1a26156a 20w22a 2020-06-01 22:37:43 +01:00
modmuss50
8c39008636 20w21a 2020-05-21 23:00:12 +01:00
modmuss50
862db8a4ab 20w18a 2020-05-02 23:39:28 +01:00
modmuss50
7ccd5bcebd 20w17a compile pass 2020-04-26 16:29:38 +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
9612c82cd3 Display flying when an elytra is used with the trinkets mod. Closes #2074 2020-04-11 15:12:13 +01:00
modmuss50
55f9a5df52 20w15a 2020-04-09 01:47:11 +01:00
modmuss50
11290e89e7 20w13a 2020-03-25 19:36:02 +00:00
modmuss50
acf59dd1a5 Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	src/main/java/techreborn/init/TRContent.java
#	src/main/java/techreborn/items/armor/BatpackItem.java
2020-03-23 20:19:53 +00:00
modmuss50
e4fb1773f3 20w12a 2020-03-18 20:58:31 +00:00
drcrazy
8f64355885 Buff Nano Saber damage. Closes #1714 2020-03-17 14:52:19 +03:00
Prospector
e3829cf44f Update some textures and rebalance a few recipes 2020-03-13 11:12:07 -07:00
modmuss50
e3749343e7 Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/compat/rei/MachineRecipeCategory.java
#	src/main/java/techreborn/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java
#	src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java
2020-03-12 20:33:54 +00:00
modmuss50
adad632549 initial 20w11a 2020-03-12 20:32:03 +00:00
drcrazy
af8bd7ae8c Bump Omni-tool damage. Closes #2043 2020-02-18 11:03:26 +03:00
drcrazy
0eb89ee122 Drills use energy to mine. Closes #2007 2020-01-25 20:51:03 +03:00
drcrazy
1cb6623dd7 Review nanosaber config 2020-01-24 16:01:56 +03:00
modmuss50
147eec26f6 Fix missed mapping. #releaseBuild 2020-01-21 15:50:33 +00:00
drcrazy
d023329de9 Quantum chest now extinguish fire. 2020-01-21 15:19:59 +03:00
modmuss50
1202a1c588 1.15.2 - mainly mapping updates. Will be backwards compatible with 1.15.1 and 1.15 2020-01-15 12:07:52 +00:00
drcrazy
a543a562b2 Fix industrial jackhammer AOE mining. Closes #1975 2020-01-14 02:22:06 +03:00
drcrazy
342043dbba Lineup batteries and energy storages. 2020-01-13 15:38:23 +03:00
drcrazy
b9c8a1a215 Slight cleanup. Energy packs uses transfer rates from tier. 2020-01-13 13:53:36 +03:00
Prospector
04a1c789c4 Seriously clean up loads of unnecessary item classes and add more configs 2020-01-12 21:20:42 -08:00
Prospector
960b064b5a Fix various issues relating to armor [Fixes #1952] 2020-01-12 19:17:35 -08:00
vhd
e4bc2a0cb7 Powered items should be indestructible now (#1970) 2020-01-10 21:49:14 +00:00
vhd
d1b395f3e4 Cables can now be covered. Thanks to vhd. Closes #1954 2020-01-10 18:07:02 +03:00
drcrazy
a115fbd736 Dispenser can use cells. Closes #1948 2020-01-10 16:09:03 +03:00
drcrazy
1d053bb592 Make electric tools enchantable on table. Closes #1944 2020-01-08 16:45:33 +03:00
modmuss50
42afb3528c Fix #1957 and Fix #1951 2020-01-05 11:38:23 +00:00
drcrazy
525f956e0d BUff Industrial Jackhammer. Some work on #1944 2020-01-04 23:31:58 +03:00
modmuss50
7b99e2e9b7 License updates + fixes 2020-01-03 22:46:07 +00:00
drcrazy
9690f780ff Do not pass to second hand after cell use on block. 2020-01-03 15:16:29 +03: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
drcrazy
6d514766ed Fixes for AdvancedJackhammer AOE mining. Closes #1935 2019-12-30 14:26:19 +03: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
06b4af59bc Fix damage and speed for gem tools. 2019-12-24 15:58:16 +03:00
drcrazy
562d333be9 Active\Inactive switch moved to RC. 2019-12-24 11:00:21 +03:00
drcrazy
0de4110f96 Check for energy in tools moved to RC. 2019-12-23 17:56:42 +03:00
drcrazy
e6707b2ddd Active\Inactive tooltip moved to RC. 2019-12-23 17:21:33 +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
drcrazy
5e9e0f3c2b Omnitool WIP mark lost 2019-12-20 16:34:42 +03:00
drcrazy
b298727563 Fix Cloaking Device 2019-12-17 17:36:24 +03:00