modmuss50
|
22fd152ec9
|
Revert "Energy storages item charging fixes, transformers fixes, electric items fixes."
This reverts commit be4f10b975 .
# Conflicts:
# src/main/java/techreborn/init/ModBlocks.java
|
2016-08-10 00:29:47 +01:00 |
|
Dragon2488
|
a5a9460707
|
Automation fixes, upgrades fixes.
|
2016-07-27 17:51:03 +07:00 |
|
Dragon2488
|
be4f10b975
|
Energy storages item charging fixes, transformers fixes, electric items fixes.
|
2016-07-25 15:10:55 +07:00 |
|
Dragon2488
|
b42b5274b5
|
Multiblock fixes (compressor, freezer, grinder), grinder recipes fixes, freezer JEI recipe show fix.
|
2016-07-25 02:26:15 +07:00 |
|
Dragon2488
|
0011553cf7
|
Sawmill changes & fixes.
|
2016-07-24 01:10:37 +07:00 |
|
Dragon2488
|
06fad2264f
|
Fusion reactor fixes & rewrite, energy fixes.
|
2016-07-22 21:45:55 +07:00 |
|
Dragon2488
|
b292fdd352
|
Rewrite to use new RebornCore Power API. Texture fixes.
|
2016-07-21 22:22:56 +07:00 |
|
Archengius
|
6f54e3801f
|
Wires now transfer energy from all mods and manages it as EU. (#686)
* Wires now transfer energy from all mods and manages it as EU. Multipart will fire in hell.
* Fix TechReborn to work with latest RebornCore
|
2016-07-21 07:51:55 -07:00 |
|
modmuss50
|
10aa2f2ffb
|
fix merge
|
2016-07-19 11:46:53 -07:00 |
|
Dragon2488
|
d982cc4028
|
Power system re-write, recipe fixes.
Please note that this version breaks all wires placed in worlds before.
|
2016-07-18 11:57:52 +07:00 |
|
al132
|
166f9a924f
|
Fixed Output of extractor (#679)
* Add CraftTweaker support for the Compressor
* Fix Extractor insertion and extraction
* Oops
|
2016-07-18 02:06:47 +01:00 |
|
Dragon2488
|
33df1d3319
|
Implemented Lightning Rod, improved ore dictionary integration for dusts, nuggets and plates. Plates now registers automatically for every gem and ingot in TR. (#673)
|
2016-07-16 10:44:54 +01:00 |
|
modmuss50
|
315c0aa509
|
Revert "Revert a shit load of stuff"
This reverts commit d25bb23e8e .
|
2016-07-01 15:55:37 +01:00 |
|
modmuss50
|
d25bb23e8e
|
Revert a shit load of stuff
|
2016-07-01 15:40:46 +01:00 |
|
modmuss50
|
d80280b110
|
Fix random world gen crash - Fix electric furnace and version bump
|
2016-06-04 17:03:22 +01:00 |
|
modmuss50
|
246113dfca
|
Fix generator being overpowered
|
2016-06-04 14:28:36 +01:00 |
|
Modmuss50
|
ae2e063440
|
Update TileBatBox.java
|
2016-06-04 14:22:48 +01:00 |
|
modmuss50
|
1fd58d8986
|
Improve matter fab
|
2016-05-28 19:33:17 +01:00 |
|
modmuss50
|
9fa5e560e1
|
Fixes #561
|
2016-05-23 17:09:38 +01:00 |
|
modmuss50
|
78ccf1bcfb
|
Tweak some power values, closes #564
|
2016-05-23 17:05:10 +01:00 |
|
modmuss50
|
128a95c338
|
jei 1.9.4 and clean tile packets
|
2016-05-19 09:07:31 +01:00 |
|
modmuss50
|
74d500a2fd
|
Update to minecraft version 1.9.4
|
2016-05-18 16:53:54 +01:00 |
|
modmuss50
|
960bac8cc2
|
Fix Server Crash
|
2016-05-13 07:46:17 +01:00 |
|
modmuss50
|
b0fbd5aea0
|
Update to support removal of ic2 api
|
2016-05-12 19:16:40 +01:00 |
|
modmuss50
|
a78b2b6745
|
Bump the windmill eu output
|
2016-05-09 21:24:37 +01:00 |
|
modmuss50
|
4cd4e4109b
|
Speed improvement
|
2016-05-09 18:33:01 +01:00 |
|
modmuss50
|
45e31c1aef
|
Added pump
|
2016-05-08 21:42:09 +01:00 |
|
modmuss50
|
c9f84375ac
|
Fixes #549 gui still needs syncing
|
2016-05-08 10:00:06 +01:00 |
|
modmuss50
|
e71953dc2a
|
Fixes #556 and fixes #550
|
2016-05-08 09:34:52 +01:00 |
|
modmuss50
|
4095a0b52d
|
Auto update mappings
|
2016-05-06 22:13:24 +01:00 |
|
modmuss50
|
a2d626bc61
|
Fixes #523
|
2016-04-23 13:32:03 +01:00 |
|
modmuss50
|
912eced5e5
|
Move assemblingmachine and centrifuge to the new system
|
2016-04-13 16:25:51 +01:00 |
|
modmuss50
|
b822cee9fb
|
Update walia, add MT and CT support back, Fix #519, update for new RC bucket thing
|
2016-04-13 13:47:02 +01:00 |
|
modmuss50
|
23d55e6251
|
Work on the new container stuff
|
2016-04-12 08:33:38 +01:00 |
|
modmuss50
|
98d459735f
|
Implement IRecipeCrafterProvider on all tiles that need it
|
2016-04-11 17:50:00 +01:00 |
|
modmuss50
|
dded3c685a
|
Massive tile clean up, I might have broken something somewhere
|
2016-04-11 17:43:54 +01:00 |
|
modmuss50
|
ef133ab25b
|
Start on tile rewrite
|
2016-04-11 17:23:57 +01:00 |
|
modmuss50
|
bc7b5b2566
|
Fixes #511
|
2016-04-08 14:24:53 +01:00 |
|
Prospector
|
3b94b09194
|
Add Transformer configs
Closes #501
|
2016-04-03 15:20:35 -07:00 |
|
modmuss50
|
510f969c94
|
Auto remove un needed things in the code
|
2016-04-03 14:34:39 +01:00 |
|
modmuss50
|
7e7fcf2ad9
|
Made the api usefull
|
2016-04-03 14:25:46 +01:00 |
|
modmuss50
|
df61729d6f
|
Some work on the new api
|
2016-04-03 14:07:45 +01:00 |
|
modmuss50
|
3d819967be
|
Fixes #444
|
2016-04-01 20:22:55 +01:00 |
|
Stuart Pomeroy
|
02357ce1a4
|
Fix Tiles and Guis, closes #478 and closes #479
|
2016-03-29 20:27:23 +01:00 |
|
Stuart Pomeroy
|
4c2877d0d5
|
Rewrite Transformers, closes #441
|
2016-03-29 10:29:51 +01:00 |
|
Stuart Pomeroy
|
fbfd42427e
|
Fix wrench.
|
2016-03-29 10:01:18 +01:00 |
|
Stuart Pomeroy
|
4f9f98e1bd
|
Revert "Closes #443, #466, #468"
This reverts commit faa6aa30d0 .
|
2016-03-29 09:58:32 +01:00 |
|
Stuart Pomeroy
|
faa6aa30d0
|
Closes #443, #466, #468
|
2016-03-29 09:58:07 +01:00 |
|
Stuart Pomeroy
|
2209177e1a
|
Fix config changes etc.
|
2016-03-28 20:51:23 +01:00 |
|
Stuart Pomeroy
|
427963b40a
|
Closes #434, Add tooltips to grinder and batbox. Fix centrifuge. closes #436
|
2016-03-28 17:50:25 +01:00 |
|
Stuart Pomeroy
|
1dfa6c094f
|
Fix Energy Storage not outputting, closes #435
|
2016-03-28 17:01:36 +01:00 |
|
Stuart Pomeroy
|
6ff03bc706
|
Fix block item drops and such. Closes #428
|
2016-03-28 12:23:55 +01:00 |
|
Stuart Pomeroy
|
c25ab8227a
|
Update the Tiles for Storage. Also work on Drops. Not Finished.
|
2016-03-28 11:45:21 +01:00 |
|
Stuart Pomeroy
|
fffeb93ff1
|
Fix Solar panels
|
2016-03-28 10:09:26 +01:00 |
|
Stuart Pomeroy
|
1993fa92bd
|
Add MFE GUI and made batterys charge and decharge?
|
2016-03-28 09:34:48 +01:00 |
|
Stuart Pomeroy
|
dfb7d0afd4
|
Fix Merges
|
2016-03-27 20:14:13 +01:00 |
|
Stuart Pomeroy
|
78e8acce7b
|
Fixed some GUIS and some Mass Fabs
|
2016-03-27 20:10:49 +01:00 |
|
modmuss50
|
1ab2415e40
|
Fix crash, fix #414 and fix #411
|
2016-03-27 18:56:27 +01:00 |
|
Stuart Pomeroy
|
525a91e931
|
Fixes solar panels being powered wierdly...
|
2016-03-27 18:25:45 +01:00 |
|
modmuss50
|
49e45b27e2
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-27 18:06:50 +01:00 |
|
gigabit101
|
c73d1dc773
|
closes #425
|
2016-03-27 19:05:05 +01:00 |
|
modmuss50
|
8261384cdd
|
Fixes #420
|
2016-03-27 18:06:40 +01:00 |
|
Stuart Pomeroy
|
8fba82312c
|
Closes #402,#404,406
|
2016-03-27 17:41:56 +01:00 |
|
Stuart Pomeroy
|
6498bd1974
|
Update to forge and fuck up the cables? Not sure :P
|
2016-03-26 15:58:38 +00:00 |
|
modmuss50
|
5eed5b161d
|
Code formatter take 2
|
2016-03-25 09:47:34 +00:00 |
|
modmuss50
|
33985f1a31
|
Revert "Added code formatter"
This reverts commit b9448d5d90 .
|
2016-03-24 00:41:47 +00:00 |
|
modmuss50
|
b9448d5d90
|
Added code formatter
|
2016-03-24 00:39:26 +00:00 |
|
gigabit101
|
710f9c04e7
|
gui fixs
|
2016-03-23 23:31:40 +00:00 |
|
gigabit101
|
6d1a8a835e
|
more gui things
|
2016-03-22 23:58:16 +00:00 |
|
gigabit101
|
123e704caf
|
fixed some machine drops
|
2016-03-22 23:34:43 +00:00 |
|
modmuss50
|
fee31761b1
|
Fix NPE
|
2016-03-20 19:51:41 +00:00 |
|
modmuss50
|
d8829fd33c
|
Fix some small issues
|
2016-03-20 16:27:57 +00:00 |
|
gigabit101
|
2fa00b9c7f
|
little fixs
|
2016-03-19 23:18:31 +00:00 |
|
modmuss50
|
e319398bc9
|
Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
|
2016-03-16 17:09:34 +00:00 |
|
modmuss50
|
5a0f8be435
|
Added transformers
|
2016-03-16 16:54:44 +00:00 |
|
TheDoctorSoda
|
c4a00c8152
|
[TEXTURES] LV, MV, and HV transformers.
|
2016-03-15 11:03:26 -07:00 |
|
modmuss50
|
8c24711d4f
|
Optimise imports
|
2016-03-15 08:13:05 +00:00 |
|
modmuss50
|
e0547cecff
|
Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
|
2016-03-15 08:07:06 +00:00 |
|
TheDoctorSoda
|
e90592403b
|
Added Scrapboxinator, reverted yellow energy outlines, added grinder textures
|
2016-03-14 21:53:05 -07:00 |
|
modmuss50
|
b7c71edf4f
|
Added MFE and MFSU blocks and tiles, gui and textures to come later
|
2016-03-14 08:34:15 +00:00 |
|
modmuss50
|
5480a5c3e5
|
Added batBox, gui to come later
|
2016-03-14 08:26:41 +00:00 |
|
modmuss50
|
cc0b762b56
|
87 errors, will finish later
|
2016-03-13 17:38:12 +00:00 |
|
modmuss50
|
b4a16c03ed
|
And 50 more errors fixed
|
2016-03-13 16:15:27 +00:00 |
|
modmuss50
|
9a40abbe78
|
Now comes the grind, 244 errors left
|
2016-03-13 16:08:30 +00:00 |
|
modmuss50
|
7f920b282f
|
Optimise imports to make it easier to find and replace package names
|
2016-03-13 15:37:55 +00:00 |
|
gigabit101
|
d069bf77e3
|
closes #377
|
2016-03-09 13:59:38 +00:00 |
|
gigabit101
|
e1cd18ad7d
|
closes #376
|
2016-03-09 13:46:08 +00:00 |
|
modmuss50
|
9ac1db6dc1
|
Fixes #375
|
2016-03-09 08:35:06 +00:00 |
|
modmuss50
|
7e5e40a338
|
Added machine teirs (can someone check them)
Fixed crash when machines explode
|
2016-03-08 17:34:04 +00:00 |
|
TheDoctorSoda
|
2221a303ad
|
Move thermal generator TE to proper package
|
2016-03-07 21:56:37 -08:00 |
|
modmuss50
|
67526480ad
|
Added walia support for the cables
|
2016-03-07 20:33:08 +00:00 |
|
gigabit101
|
626cbbbbc7
|
derp
|
2016-03-07 17:26:04 +00:00 |
|
gigabit101
|
080b633493
|
Finish up on recycler and temp jei handler
|
2016-03-07 14:07:52 +00:00 |
|
gigabit101
|
007f9266e5
|
Recycler output is now a random chance
|
2016-03-07 12:45:54 +00:00 |
|
gigabit101
|
77e2edc005
|
More work on recycler
|
2016-03-07 00:21:22 +00:00 |
|
gigabit101
|
02ac62a180
|
Started Recycler
|
2016-03-06 23:15:28 +00:00 |
|
gigabit101
|
e6c510bbea
|
Fixed machines returning wrong itemstack when wrenched
|
2016-03-06 21:03:20 +00:00 |
|
gigabit101
|
059b197d5c
|
More recipe tweaks
|
2016-03-06 21:00:42 +00:00 |
|
gigabit101
|
5f1d059058
|
Added logic to Electric furnace
|
2016-03-06 20:39:31 +00:00 |
|
gigabit101
|
87d41aaa53
|
Small code clean up
|
2016-03-06 20:14:42 +00:00 |
|