Commit graph

2947 commits

Author SHA1 Message Date
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
drcrazy
772b0a5d65 Removed unused imports in CT classes. 2018-03-22 18:02:54 +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
23b4ef1038 Merge remote-tracking branch 'origin/1.12' into 1.12 2018-03-20 17:49:29 +00: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
2e7dc82b86 Hide scrapboxes output in JEI by default. 2018-03-19 15:20:42 +03:00
modmuss50
da6016b692 Cleanup recipe ore dict setting. #1455 2018-03-19 09:41:20 +00:00
modmuss50
453fd3856a Fix Quantum Chest holding its items when broken, fixes #1462 2018-03-19 09:26:16 +00:00
modmuss50
369b8a6266 Fixes #1461 2018-03-18 23:43:03 +00:00
modmuss50
9e3e2e204c Fixes #1457 2018-03-18 23:35:22 +00:00
modmuss50
c0c20d91b9 Fixes #1459 2018-03-18 23:27:41 +00:00
modmuss50
5f162d08b1
Fix compile 2018-03-10 20:20:24 +00:00
modmuss50
06f7f64efb
Add stone variants for the other end ores. 2018-03-10 20:18:53 +00:00
modmuss50
f1a3387fbf
Add extractor support to craft tweaker 2018-03-10 19:50:24 +00:00
modmuss50
d7ce35428c
Add a config option to change the textures of the end ores to use the stone background.
I still need to add the other ores, but this is the main one that needs doing.
2018-03-09 19:57:20 +00:00
modmuss50
3b914e658c Allow using ore dict entries in CraftTweaker Closes #1396 2018-03-06 21:28:05 +00:00
modmuss50
d948db1b7f Possible fix for #1450 2018-03-06 21:07:49 +00:00
drcrazy
6b68a8aef2 Temporary fix for #1429. 2018-03-06 02:48:08 +03:00
drcrazy
111ee7630a Updated API reference for recipes. 2018-03-05 14:45:23 +03:00
drcrazy
4a369d0ee7 Updated buildcraft version. More oredict for centrifuge. 2018-02-22 13:35:18 +03:00
drcrazy
7f4d5ab401 Removed duplicate recipe for dirt in centrifuge. 2018-02-21 10:51:15 +03:00
drcrazy
a80d3eb9ca Removed duplicate recipe for Distillation tower 2018-02-19 18:21:10 +03:00
modmuss50
ec6fee9230
Fix crash with OC compat 2018-02-16 20:14:36 +00:00
drcrazy
0ecdce2717 Made solar panels configurable. 2018-02-16 12:17:05 +03:00
modmuss50
a54de62a6a Some more basic methods for open computers 2018-02-14 14:12:31 +00:00
modmuss50
2180fe4ef2 Initial work on open computers support, more to come in the future.
When things are a bit more final with it, I will add some docs onto the wiki pages.
2018-02-13 23:56:38 +00:00
modmuss50
f7008d9c87 Fix Issues with fake players breaking wood logs, fixes #1436 2018-02-13 17:44:46 +00:00
drcrazy
c5d162c527 Fixed GUI progress for fluid generators. Some work on #1430 2018-02-13 14:27:31 +03:00
冷风
ce9066e546 Update zh_cn.lang (#1440) 2018-02-13 08:32:03 +00:00
drcrazy
2f7ce0f563 Limited Centrifuge bottom slot to cells only. 2018-02-13 01:56:18 +03:00
Dimmerworld
217d7e1a44 Display(in hand) adjustments for Alarm, Led, and led2 (#1439) 2018-02-12 17:18:33 +03:00
modmuss50
9c7f1995a8
Update year in license 2018-02-11 14:08:13 +00:00
modmuss50
9c3d9d8e27
Merge remote-tracking branch 'origin/1.12' into 1.12 2018-02-11 14:01:45 +00:00
modmuss50
3fe260b739
Revert "Add a config to lock the rolling machine recipe + some optimisations #1412"
This reverts commit 0b8f139
2018-02-11 14:01:24 +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
Dimmerworld
9349ffe264 Update forge and Sound options for Alarm (#1435)
* Update forge and Sound options for Alarm

* Revert changes to gradle wrapper properties

* Cleanup imports

* Removed sneaky debugging stuff
2018-02-10 11:53:11 +00:00
drcrazy
38933ca8a8 Made centrifuge to use oreDict for some inputs 2018-02-07 15:36:56 +03:00
drcrazy
543a2a7271 Added removeAll for reactor and rolling machine. Closes #1427 2018-02-02 18:33:45 +03:00
modmuss50
0b8f139e6d Add a config to lock the rolling machine recipe + some optimisations #1412 2018-01-31 13:47:48 +00:00
modmuss50
a3d2aa9907 Merge remote-tracking branch 'origin/1.12' into 1.12 2018-01-31 13:08:35 +00:00
modmuss50
e9039e6693 Fixes AutoCrafting table crash closes #1423 2018-01-31 13:08:21 +00:00
drcrazy
73aa9f1d5e Nerfed oil cell energy output. Closes #1424 2018-01-31 15:39:00 +03:00
modmuss50
34816e5ee7 Fixes #1425 2018-01-31 10:09:39 +00:00
modmuss50
af57ef708d Fixes #1426 2018-01-31 09:46:26 +00:00
modmuss50
6c9712956c Add back config options for copact modules 2018-01-30 23:46:34 +00:00
modmuss50
8a4aafb042 Add some missing configs + small cleanup 2018-01-30 23:32:45 +00:00
modmuss50
7f26541237 Add config gui
Remove unused config
2018-01-30 23:20:21 +00:00
modmuss50
9cd916f9ce Fix duplicate config key name 2018-01-30 22:10:35 +00:00
drcrazy
a6df9441ec Updated reactor GUI. Closes #1422 2018-01-29 18:17:32 +03:00
modmuss50
2e115242a2 Might fix #1421 2018-01-29 13:14:46 +00:00
drcrazy
73b2f36b24 Fixes for wrenching blocks. Closes #1417 and #1418 2018-01-26 12:27:58 +03:00
drcrazy
79582cd94b Fill\drain fluidgen tank only on server 2018-01-21 02:16:51 +03:00
modmuss50
2cb5645806
Fixes #1399 2018-01-20 16:27:50 +00:00
modmuss50
677fa7765c
Update old tank syncing code, fixes TechReborn/TechReborn/issues/1377 2018-01-20 16:16:56 +00:00
drcrazy
e4736447bd RecipeCrafter for scrapboxinator 2018-01-19 18:08:27 +03:00
drcrazy
44b6f20357 Updated scrapboxinator to crafter and new GUI. 2018-01-19 18:07:52 +03:00
modmuss50
e0eb725878 Fix crash when codechicken lib isn't installed. #releaseBuild 2018-01-19 11:19:53 +00:00
drcrazy
c69b9f46b6 Added ability to remove fluidgenerator recipe via CT. Closes #1404 2018-01-19 11:17:36 +03: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
8e12543902 Fixed RemoveAll in CraftTweaker. Closes #1410 2018-01-17 15:39:41 +03:00
drcrazy
ca9508c381 Deprecated ScrapboxList. 2018-01-17 13:57:40 +03:00
drcrazy
4fc45221a2 Removed scrapboxlist usage. Closes #1407 2018-01-17 13:53:25 +03:00
modmuss50
1bfb5d5604
Fix crash with Fusion Control computer, fixes part of #1395 2018-01-12 19:51:06 +00:00
modmuss50
819e3a5ee1
Add a null check for RayTraceResult may fix #1393 2018-01-12 19:48:41 +00:00
drcrazy
52e1fb2dc9 Fixed compressor recipe for lapis. Second point from #1396 2018-01-12 18:48:09 +03:00
drcrazy
af755a9f6e Changed carbon fiver recipe to shaped. Closes #1394 2018-01-12 01:13:44 +03:00
drcrazy
27b1535242 Added oreDict for blockBronze. Closes #1401 2018-01-11 14:53:40 +03:00
drcrazy
9fafbf1ed4 Changed TR solar panel to use paneGlass. Closes #1400 2018-01-11 13:55:54 +03:00
drcrazy
161553503b Fix oredict for smallDusts. Closes #1392 2018-01-11 13:31:15 +03:00
InterPlay
9de4eb947b Updated to the newer version coming soon (pt-BR) (#1408)
* Updated pt-BR translation. Kudos to InterPlay02
2018-01-11 13:13:22 +03:00
drcrazy
4332e8852f TR part for #1402 done. RC to go. 2018-01-10 15:57:58 +03:00
drcrazy
85cd77e5c1 Some work on #1402. Teh moar to come. 2018-01-09 17:48:14 +03:00
modmuss50
268a16958b Format + license headers. 2018-01-08 18:29:12 +00:00
modmuss50
2a0a9e5636 Merge remote-tracking branch 'remotes/origin/1.12' into feature-alarm 2018-01-08 17:45:29 +00:00
Dimmerworld
86d37514a7 Recipe for alarm and misc fixes 2018-01-03 15:17:20 +11:00
Dimmerworld
2177b72e41 Animation 2018-01-03 14:26:23 +11:00
Modmuss50
8d6c595215
Merge pull request #1391 from DYColdWind/patch-1
Update zh_cn.lang
2017-12-30 01:58:05 +00:00
冷风
78bc17a721
Update zh_cn.lang 2017-12-30 07:29:27 +08:00
modmuss50
5c16978e4d
Improve it a bit more 2017-12-29 18:15:27 +00:00
modmuss50
1d6c6139ec
Move JEI item pane out of the way if the slot config goes of the side of the screen. 2017-12-29 18:12:04 +00:00
modmuss50
ff2ed99d14
Reimplement JEI show recipes button, so it can be disabled when the slot config is shown.
I didnt see a better way to do this, please let me know if you know better.
2017-12-29 17:24:01 +00:00
modmuss50
3e8cf290bf
Fixes crash with auto crafting table. 2017-12-29 17:09:19 +00:00
modmuss50
0b6808013d
Fixes crash with recipe book. 2017-12-29 12:50:10 +00:00
modmuss50
57f3e43ec5
Add removeAll() to all machines in crafttweaker, closes #1389 2017-12-29 12:33:05 +00:00
Dimmerworld
bdc34d673c Proper faces 2017-12-29 16:50:35 +11:00
冷风
5f4a1be06b
Update zh_cn.lang 2017-12-29 13:26:01 +08:00
modmuss50
602cfebc38
#betaBuild 2017-12-28 15:02:59 +00:00
modmuss50
5b26f36082
Small tweak to config gui 2017-12-28 14:57:52 +00:00
modmuss50
9ff30a4344
Add support for charging FE based items 2017-12-28 14:53:56 +00:00
modmuss50
af54caf4bf
Merge remote-tracking branch 'origin/1.12' into 1.12 2017-12-28 14:40:44 +00:00
modmuss50
3b69a1a143
Added the ability to filter inputs on a slot so it only accepts valid items 2017-12-28 14:40:19 +00:00
Modmuss50
ff1dc294df
Merge pull request #1388 from InterPlay02/1.12
(pt-BR) Updated to match the new en_us.lang file
2017-12-28 14:31:45 +00:00
InterPlay
75f01ee507
Updated to match the new en_us.lang file (pt-BR) 2017-12-28 12:29:32 -02: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
fbd31e1177
More gui fixes for slots 2017-12-28 14:01:33 +00:00
modmuss50
04b4fa2b88
Fix tank rendering over slot config popup 2017-12-28 13:46:33 +00:00
drcrazy
7dfc8e41c3 Very-very light change in cross colors. 2017-12-28 14:43:50 +03:00
drcrazy
f18adc9c0a Fixed texture issue in JEI. 2017-12-28 02:05:13 +03:00
InterPlay
61429dc15e Fixed a wrong placement of signals (#1385) 2017-12-27 22:30:43 +00:00
InterPlay
77b8b75302
Fixed a wrong placement of signals 2017-12-27 20:11:59 -02:00
Dimmerworld
e93451b595 Woop woop - Alarm work (#1380)
* Alarm makeover

Model,
boundrybox, 
textures,
name  localization for the alarm

* Actual translations for Alarm

* Texture resize

As requested
(Didn't notice dimensions when I was grabbing off Prospector)
2017-12-26 01:30:36 +00:00
modmuss50
510697c021
Fix #1378 2017-12-25 00:25:11 +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
Modmuss50
a59647a0b7
Merge pull request #1379 from InterPlay02/1.12
Fixed one single word
2017-12-23 22:13:45 +00:00
drcrazy
05884b2fda Fix issue with chainsaw cutting speed. Closes #1376 2017-12-23 00:28:53 +03:00
InterPlay
91ee4e722d
Fixed one single word 2017-12-22 12:32:24 -02:00
modmuss50
5a40749bcd
Fixed #1364 2017-12-22 12:51:16 +00:00
modmuss50
623983f20a
Merge remote-tracking branch 'origin/1.12' into 1.12 2017-12-19 23:50:52 +00:00
modmuss50
7ab59db7c0
Improve idle auto crafting table tick time, more work still needs to be done. Closes #1374 2017-12-19 23:50:38 +00:00
drcrazy
1b9844a6cd Made obsidian grindable. 2017-12-19 13:05:57 +03:00
冷风
ec1be6b639
Update zh_cn.lang 2017-12-19 13:48:50 +08:00
modmuss50
7594b55fb5
Start work on the alarm 2017-12-18 19:58:52 +00:00
InterPlay
2815bc84d4
Just fixed a single word 2017-12-18 16:09:39 -02:00
InterPlay
1909d426e3
Uploaded pt-BR.lang File 2017-12-18 16:08:00 -02:00
drcrazy
328aac0ed2 Make lapis ore grindable to vanilla lapis. 2017-12-18 18:29:00 +03:00
modmuss50
677bb59ceb Should hopefully fix server crash #releaseBuild Fixes #1371 2017-12-18 01:48:25 +00:00
modmuss50
55c5f58c7e
Clocking device now makes the player fully invisible 2017-12-17 22:13:29 +00:00
modmuss50
3c7cd638c1
Make smaller cables have a smaller bounding box 2017-12-17 22:05:14 +00:00
modmuss50
dc4cdbb9cc
Fixes #1368 2017-12-17 21:53:14 +00:00
modmuss50
ee075feea9
Fixes #1359 2017-12-17 21:43:12 +00:00
modmuss50
7f289e2356
Add ic2 item discharge support, closes #1357 2017-12-17 21:36:48 +00:00
modmuss50
82eb0f62d6
Fixes #1354 2017-12-17 21:24:25 +00:00
drcrazy
dce7e43c4f Fixed amount for empty cells. Closes #1366 2017-12-16 01:46:34 +03:00
drcrazy
6c7f9078ec Secondary gem moved to eventHandler. Closes #1365 2017-12-15 16:43:48 +03:00
drcrazy
376f02df26 Updated Sawmill GUI and TileEntity. 2017-12-13 12:29:39 +03:00
drcrazy
1d18740215 Fixed rotation for solar panels. Closes #1358 2017-12-11 12:03:20 +03:00
drcrazy
17f819e9c6 Added charcoal dust grinder recipe. 2017-12-08 20:25:25 +03:00
drcrazy
a419189926 Added dust->ingot<->block recipes for several materials. Closes #1356 2017-12-08 16:43:04 +03:00
modmuss50
53c731d678 Handful of improvements to the electrical furnace, closes #1349 2017-12-04 20:55:57 +00:00
drcrazy
777707373a Fixed cells piping into Industrial Grinder. 2017-12-04 23:10:33 +03:00
drcrazy
2f54305f6d Added filter for fluidSlot. Closes #1352 2017-12-04 22:34:34 +03:00
冷风
e8d6009e83
Update zh_cn.lang 2017-12-02 08:26:48 +08:00
drcrazy
df24adb936 Made solar panel wrenchable 2017-12-01 19:24:02 +03:00
drcrazy
6202b46cf7 Fixed unused imports 2017-12-01 19:04:30 +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
b2d2be24c6 Updated recipies and fixed build 2017-11-30 16:46:11 +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
drcrazy
9ac8b31599 Fixed TOP\Waila icon for active machine 2017-11-29 15:23:40 +03:00
modmuss50
4d043faa27 Fixes #1344 2017-11-29 09:35:00 +00:00
modmuss50
2603fa5df7 Merge remote-tracking branch 'origin/1.12' into 1.12 2017-11-28 17:44:18 +00: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
703f49752e Updated top texture for solar panels 2017-11-28 16:52:14 +03:00
drcrazy
be227b4edb Fixed type in zenclass name. Closes #1332 2017-11-28 15:37:38 +03:00
modmuss50
3afe2c8910 Add lang names for new lights 2017-11-28 15:37:34 +03:00
Alistair Buxton
642e6b0f2b Implement powered lighting. 2017-11-28 15:37:32 +03:00
drcrazy
34913c4817 Added config for several multiblock machines. 2017-11-28 15:23:32 +03:00
drcrazy
9a8a7455ff Fixed warning for FusionReactorRecipeWrapper 2017-11-27 17:58:37 +03:00