Commit graph

437 commits

Author SHA1 Message Date
modmuss50
b0e79aa1e6
Fixes chainsaw not working on some wooden blocks, closes #1467 2018-03-29 11:00:17 +01:00
modmuss50
54a7e338c5
Fixes drill breaking liquids, closes #1468 2018-03-29 10:57:25 +01:00
modmuss50
8e983e33ac
Buff speed upgrades again, fixes #1466 2018-03-26 16:05:45 +01:00
drcrazy
a69fa60436 Updated Advanced Drill behaviour. Closes #1463 2018-03-23 02:46:07 +03:00
modmuss50
d272111d16 Merge remote-tracking branch 'origin/1.12' into 1.12 2018-03-22 22:21:14 +00:00
modmuss50
d930d2015d Changes to the overclocker values, feedback wanted. 2018-03-22 22:20:56 +00:00
drcrazy
f1e659d22d Updated AOE block break for advanced drill. Some work on #1463 2018-03-22 18:03:51 +03:00
temp1011
a36c2d4065 Fix Drill break speed in certain conditions (#1428)
Some work on AdvancedDrill break speed. Thanks to temp1011
2018-03-22 15:39:32 +03:00
modmuss50
4b1a1b796b Allow upgrade item to stack to 16 (Still stacks to 1 in machine) + Fix potential loss of items when shift clicking. 2018-03-20 17:49:13 +00:00
drcrazy
111ee7630a Updated API reference for recipes. 2018-03-05 14:45:23 +03:00
modmuss50
9c7f1995a8
Update year in license 2018-02-11 14:08:13 +00:00
Dimmerworld
27dacb327a Alarm cleanup + tooltip and techreborn manual UI (#1437)
* Alarm cleanup and tooltip, Tech manual UI

* add peskty comma

* Compress png

* Rename to wiki and asked user before opening browser
2018-02-11 13:59:52 +00:00
modmuss50
e0eb725878 Fix crash when codechicken lib isn't installed. #releaseBuild 2018-01-19 11:19:53 +00:00
temp1011
91a56077d8 Work on Advanced Drill (#1411)
* Raytracing for drill
* Stop crashes if raytrace is somehow null
* getCount() already checks for emptiness I think
2018-01-19 10:07:40 +03:00
drcrazy
4fc45221a2 Removed scrapboxlist usage. Closes #1407 2018-01-17 13:53:25 +03:00
modmuss50
819e3a5ee1
Add a null check for RayTraceResult may fix #1393 2018-01-12 19:48:41 +00:00
modmuss50
751746df6f
Allow lang files to specify the location of the fluid name, closes #1386 2017-12-28 14:19:26 +00:00
Modmuss50
cbcb465c97
Added support for individual slot configuration
* start work on slot config

* More slot work

* More gui work for slot config

* Remove old sided code

* More slot work

* More slot memes

* Stuff seems to be working :)

* Start work on auto input / output

* Slot IO check boxes now work

* Fix buttons at different screen resolutions

* Improve close button

* Gui polish

* Fix multiblock hologram rendering

* More fixes + changes

* Cleanup + output fix
2017-12-25 00:18:43 +00:00
drcrazy
05884b2fda Fix issue with chainsaw cutting speed. Closes #1376 2017-12-23 00:28:53 +03:00
modmuss50
5a40749bcd
Fixed #1364 2017-12-22 12:51:16 +00:00
drcrazy
dce7e43c4f Fixed amount for empty cells. Closes #1366 2017-12-16 01:46:34 +03:00
Dimmerworld
3c68417fd9 Item liquidation (#1347)
We salute our brace comrades:

Solar panel
Compact solar panel
and Quantum singularity

Whom wern't quite ready to be implemented.
2017-12-01 17:16:39 +03:00
drcrazy
f6fca1c623 Merge branch '1.12' of https://github.com/TechReborn/TechReborn.git into feature/solar-panles 2017-11-29 17:13:36 +03:00
modmuss50
b8964b6eca Update mappings 2017-11-28 17:25:36 +00:00
drcrazy
eab088c094 Merge branch '1.12' into feature/solar-panles
Conflicts:
	build.gradle
	src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
	src/main/java/techreborn/blocks/lighting/BlockLamp.java
2017-11-28 17:28:47 +03:00
drcrazy
bf5b649fc4 Removed unused code, added Override annotation 2017-11-12 12:15:32 +03:00
Dimmerworld
5d0b5c3ea3 Balance, textures and items 2017-10-27 09:34:55 +03:00
Dimmerworld
9855cce93d Upgrade merge 2017-10-27 09:34:53 +03:00
Dimmerworld
c651363b73 Update to latest commit(Master) 2017-10-27 09:34:47 +03:00
drcrazy
5702e79e7a Do net reset block break progress upon item charge. Closes #1312 2017-10-20 03:00:28 +03:00
drcrazy
441ac4887a Made Cloaking device wearable in 1.12. Closes #1314 2017-10-20 01:58:35 +03:00
modmuss50
a590fd8ee1
Should fix #1289 2017-10-08 18:56:07 +01:00
drcrazy
350d3589c9 Fix warnings for subitemtype instead of supressing it 2017-10-08 01:59:28 +03:00
drcrazy
12e2cbe11b Fixed textformatting warnings 2017-10-07 14:39:30 +03:00
modmuss50
4e536718a3 Large changes to allow the Electrical Furnace to be upgraded 2017-10-04 13:35:58 +01:00
modmuss50
e5e05d0afd Chainsaw chops down the entire tree 2017-10-03 17:39:33 +01:00
modmuss50
f00214f7de Rewrite item power distribution to support fe. should fix #1260 2017-10-03 17:02:58 +01:00
drcrazy
1b4fee595d Fixed warnings 2017-09-30 03:58:01 +03:00
modmuss50
f5076ea8af Downgrade mappings + update all libs 2017-09-28 23:44:16 +01:00
modmuss50
e74067db40 1.12.2 2017-09-18 23:47:07 +01:00
drcrazy
8de19ff5e7 Fix warnings 2017-09-14 17:55:28 +03:00
drcrazy
b13d282bf1 Fix unused imports 2017-09-09 01:54:43 +03:00
drcrazy
aa2df32222 Fix build 2017-09-08 02:11:49 +03:00
drcrazy
ab1802ba5e Refactoring for translation 2017-09-08 02:03:35 +03:00
drcrazy
8588a40474 Added plateIridiumAlloy. Closes #1262. Closes #1073 2017-09-06 02:38:07 +03:00
drcrazy
07b1724e24 Updated max energy storage for several tools. Closes #1219 2017-09-01 16:19:59 +03:00
drcrazy
46f9266197 Magnalium plate is back. Closes #1109 2017-08-31 03:02:00 +03:00
modmuss50
6f6800e75a
Rewrite wrench to use new API 2017-08-30 21:57:14 +01:00
modmuss50
20e9276bd9
Fixes #1043 2017-08-30 21:25:13 +01:00
drcrazy
ab1428eb12 Fix for machine tank drain. More luv to industrial grinder. (#1254)
* Fix for machine tank drain. More luv to grinder

Fix for empty cell drained from tank.
JEI should honor power units (FE\EU) used.
Fill\drain tank only two times per second in order to avoid game crash
due to ticking entity.
2017-08-29 19:57:21 +03:00