modmuss50
|
65e651f402
|
It compiles, disable JEI as it needs redoing
|
2016-11-19 14:41:00 +00:00 |
|
modmuss50
|
a0e6a2dc34
|
Start on the update
|
2016-11-19 12:50:08 +00:00 |
|
modmuss50
|
d9d8845d6d
|
Added flare, still needs some textures
|
2016-11-06 19:14:43 +00:00 |
|
modmuss50
|
b60941ddd4
|
Fix grinder using twice is recommended power
|
2016-11-05 17:36:48 +00:00 |
|
modmuss50
|
29b0d2443f
|
Large buff to power usage, should fix #769
|
2016-11-05 17:22:24 +00:00 |
|
modmuss50
|
51331b77e7
|
Adjust MFE and MFSU values, closes #777
|
2016-11-05 17:09:57 +00:00 |
|
modmuss50
|
916913337b
|
Fix #789
|
2016-11-05 10:43:00 +00:00 |
|
modmuss50
|
603c12590d
|
Update to support RC 2.8
|
2016-11-04 20:03:05 +00:00 |
|
modmuss50
|
796df6c055
|
Auto Format code
|
2016-10-08 20:46:16 +01:00 |
|
modmuss50
|
aefe9f6a36
|
Merge branch '1.10.2' of https://github.com/TechReborn/TechReborn into 1.10.2
|
2016-09-06 22:16:29 +01:00 |
|
modmuss50
|
d5ff2a42bb
|
Fixes #723 and wrench works with ic2 machines now
|
2016-09-06 22:16:21 +01:00 |
|
Utoc
|
2ae38dea9e
|
Slot index changes (#734)
Changes slot index values to allow machines to be pulled from.
|
2016-08-27 08:02:44 +01:00 |
|
modmuss50
|
d96149fc97
|
Revert "Power system re-write, recipe fixes."
This reverts commit d982cc4028 .
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
|
2016-08-10 00:51:44 +01:00 |
|
modmuss50
|
aa05d906f9
|
Revert "Wires now transfer energy from all mods and manages it as EU. (#686)"
This reverts commit 6f54e3801f .
# Conflicts:
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
|
2016-08-10 00:45:33 +01:00 |
|
modmuss50
|
cdae866b2d
|
Revert "Rewrite to use new RebornCore Power API. Texture fixes."
This reverts commit b292fdd352 .
# Conflicts:
# src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
# src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
# src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/tiles/TileAlloyFurnace.java
# src/main/java/techreborn/tiles/TileAlloySmelter.java
# src/main/java/techreborn/tiles/TileAssemblingMachine.java
# src/main/java/techreborn/tiles/TileImplosionCompressor.java
# src/main/java/techreborn/tiles/TileIndustrialSawmill.java
# src/main/java/techreborn/tiles/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java
# src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java
# src/main/java/techreborn/tiles/teir1/TileCompressor.java
# src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java
# src/main/java/techreborn/tiles/teir1/TileExtractor.java
# src/main/java/techreborn/tiles/teir1/TileGrinder.java
# src/main/java/techreborn/tiles/teir1/TileRecycler.java
|
2016-08-10 00:45:07 +01:00 |
|
modmuss50
|
8a0d981018
|
Revert "Fusion reactor fixes & rewrite, energy fixes."
This reverts commit 06fad2264f .
|
2016-08-10 00:30:08 +01:00 |
|
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 |
|
gigabit101
|
90f5d77a41
|
Finish on Iron furnace
Added Jei support to Iron Furnace
|
2016-03-06 19:59:39 +00:00 |
|
gigabit101
|
a84075ff69
|
Nerfed generator and fix generator gui
|
2016-03-06 15:42:12 +00:00 |
|
gigabit101
|
b7212bec69
|
Fixed generator not storing inv
|
2016-03-06 15:20:38 +00:00 |
|
gigabit101
|
e96fe4bea7
|
grinder now returns grinder
|
2016-03-05 23:31:22 +00:00 |
|
modmuss50
|
06d23b10b7
|
Remove overcomplicated powernet
|
2016-03-02 15:42:45 +00:00 |
|
modmuss50
|
80d5e00706
|
Power net work
|
2016-02-29 17:30:46 +00:00 |
|
modmuss50
|
e4b8918224
|
More work on the cables, and add items
|
2016-02-27 19:36:01 +00:00 |
|
modmuss50
|
1cd886e770
|
Made it compile
|
2016-02-27 19:03:10 +00:00 |
|
modmuss50
|
4b5d05a063
|
Started work on the new PowerNetwork
|
2016-02-27 19:02:28 +00:00 |
|
gigabit101
|
6549282ea0
|
Cleaned up imports
|
2016-02-26 13:03:30 +00:00 |
|
modmuss50
|
e3c71248a4
|
Added solar panel textures that are based on sate
|
2016-02-26 08:26:24 +00:00 |
|
modmuss50
|
ec054e09f6
|
Rebalance the windmill
|
2016-02-25 20:29:56 +00:00 |
|
modmuss50
|
d0392dabb8
|
Added wind and water mill
|
2016-02-25 20:03:58 +00:00 |
|
modmuss50
|
ed3d3c78b5
|
Added solar panel
|
2016-02-25 18:21:59 +00:00 |
|
modmuss50
|
b61acffc68
|
Generator logic
|
2016-02-24 16:11:07 +00:00 |
|
modmuss50
|
46cdf8f587
|
Fixes to configs, optimise imports.
|
2016-02-24 08:18:21 +00:00 |
|
gigabit101
|
0522e9539f
|
Added some textures
Added Tree Tap
Added Tree Tap logic
|
2016-02-20 22:50:24 +00:00 |
|
modmuss50
|
457178842c
|
Revert "Move IC2 api"
This reverts commit ac43b5afc4 .
|
2016-02-20 17:06:46 +00:00 |
|
modmuss50
|
ac43b5afc4
|
Move IC2 api
|
2016-02-20 17:02:28 +00:00 |
|
modmuss50
|
71c2bfee7f
|
Moved power system to RC and spawn trees in groups
|
2016-02-20 16:59:31 +00:00 |
|
gigabit101
|
047625389d
|
Added compressor, extractor, electric furnace
|
2016-02-20 03:07:56 +00:00 |
|
gigabit101
|
cd13932bde
|
Basic generator just needs logic
|
2016-02-20 02:21:44 +00:00 |
|
gigabit101
|
8ad4a45716
|
Added basic Grinder
|
2016-02-20 00:57:57 +00:00 |
|
modmuss50
|
415531587b
|
Fix incorrect merge
|
2016-01-16 13:11:08 +00:00 |
|
modmuss50
|
2a617919d9
|
Merge remote-tracking branch 'remotes/origin/1.7.10' into 1.8.9
# Conflicts:
# src/main/java/techreborn/compat/fmp/ForgeMultipartCompat.java
# src/main/java/techreborn/tiles/TileBlastFurnace.java
|
2016-01-16 13:09:09 +00:00 |
|
gigabit101
|
1ed3d226f2
|
Closes #320
|
2016-01-16 04:27:17 +00:00 |
|
modmuss50
|
7139a62102
|
Update to fixed Reborn core and bump version
|
2016-01-13 13:40:02 +00:00 |
|
modmuss50
|
b588e8c08a
|
IC2 Classic API support (This is all you are getting)
If this is broken I dont care, if it has broken other things I will care.
|
2016-01-07 10:46:13 +00:00 |
|
mezz
|
ad0b45cd2a
|
Add industrial sawmill recipes
|
2015-12-31 02:11:24 -08:00 |
|
mezz
|
5addee32e6
|
Add grinder recipes
|
2015-12-31 00:56:09 -08:00 |
|
modmuss50
|
2320ceb2c3
|
Fixed machines loosing state
|
2015-12-23 12:40:48 +00:00 |
|
Modmuss50
|
eedabb9e7d
|
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts:
# src/main/java/techreborn/client/gui/GuiGrinder.java
# src/main/java/techreborn/tiles/TileGrinder.java
|
2015-12-16 16:06:33 +00:00 |
|
Modmuss50
|
96a7b56b5f
|
Fixes #304
|
2015-12-16 15:56:12 +00:00 |
|
Modmuss50
|
5324016199
|
fixes #302
|
2015-12-16 11:07:34 +00:00 |
|
Modmuss50
|
fbc5291a1d
|
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
|
2015-12-14 18:14:12 +00:00 |
|
Modmuss50
|
23255bdfff
|
Fixes #301
|
2015-12-14 18:13:47 +00:00 |
|
Modmuss50
|
d5ce5cba04
|
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts:
# src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java
|
2015-12-12 11:41:21 +00:00 |
|
Modmuss50
|
cc6dfbc3c4
|
Fixes #295
|
2015-12-11 21:52:35 +00:00 |
|
Modmuss50
|
5c95b238fa
|
Fixes #296
|
2015-12-11 21:33:32 +00:00 |
|
modmuss50
|
40f78c3938
|
Merge branch 'master' into 1.8.8
Conflicts:
build.gradle
|
2015-12-05 20:30:20 +00:00 |
|
modmuss50
|
cf36bc9dc1
|
Fixes #293 and removed java doc
|
2015-12-05 20:23:40 +00:00 |
|
modmuss50
|
a795f90971
|
Update forge, fix ticking tiles.
|
2015-12-05 20:14:32 +00:00 |
|
modmuss50
|
3367e990be
|
Update to new forge and mappings
|
2015-11-29 09:52:45 +00:00 |
|
Modmuss50
|
b0784c44d2
|
Fixes for latest forge and more rendering.
|
2015-11-26 17:35:31 +00:00 |
|
Modmuss50
|
9f3622ea33
|
some more texture work
|
2015-11-25 21:03:55 +00:00 |
|
Modmuss50
|
bce444a4ff
|
0
|
2015-11-23 20:34:05 +00:00 |
|
Modmuss50
|
fe9d41ac76
|
50
|
2015-11-23 20:27:06 +00:00 |
|
Modmuss50
|
839647ed85
|
734
|
2015-11-23 19:51:40 +00:00 |
|
Modmuss50
|
30879a534a
|
859
|
2015-11-23 19:19:18 +00:00 |
|
Modmuss50
|
b88fe49ee2
|
1936
|
2015-11-23 18:41:29 +00:00 |
|
Modmuss50
|
92ca6548c6
|
2211
|
2015-11-23 15:15:42 +00:00 |
|
Modmuss50
|
fa9cd98b5a
|
4693
|
2015-11-23 14:47:50 +00:00 |
|
Modmuss50
|
011ebaba1d
|
4862
|
2015-11-23 14:45:16 +00:00 |
|
Modmuss50
|
f0a70fa478
|
5235
|
2015-11-23 14:40:30 +00:00 |
|
modmuss50
|
d545521d04
|
Added PlayerDectector closes #286
|
2015-11-22 11:16:54 +00:00 |
|
modmuss50
|
05e7ecf2f3
|
Removed sout lines
|
2015-11-22 10:33:21 +00:00 |
|
Modmuss50
|
806cf757a5
|
Fixes #264
|
2015-11-18 19:41:37 +00:00 |
|
Modmuss50
|
3f41e26ece
|
Fixes some issues with the fustion reactor.
|
2015-11-18 17:02:22 +00:00 |
|
Modmuss50
|
758d918bdb
|
Got the Vacuum Freezer working.
|
2015-11-18 08:35:34 +00:00 |
|
Modmuss50
|
3114576e7b
|
Most of the Vacuum Freezer(Not working just yet)
|
2015-11-17 21:48:06 +00:00 |
|
Modmuss50
|
7db2e0dc8c
|
Polish to the reactor
|
2015-11-16 21:50:09 +00:00 |
|
Modmuss50
|
a63128aa7e
|
Added Fusion Reactor
|
2015-11-16 21:10:39 +00:00 |
|
Modmuss50
|
f42c127201
|
Added basic fustion reactor multiblock checking.
|
2015-11-16 15:20:19 +00:00 |
|
Modmuss50
|
100293fb8e
|
Started work on reactor.
|
2015-11-16 13:36:44 +00:00 |
|
Modmuss50
|
19d269b1de
|
Fixes #271
|
2015-11-16 11:17:36 +00:00 |
|
modmuss50
|
16f1a8de17
|
Charge bench recode.
|
2015-11-13 19:00:17 +00:00 |
|
gigabit101
|
cc2b6a8df3
|
All machines can now be powered with batteries
|
2015-11-13 16:40:01 +00:00 |
|
gigabit101
|
0ebf0c95dd
|
more charge slots
|
2015-11-13 16:29:35 +00:00 |
|
gigabit101
|
a74910e763
|
Some work on charge slots
|
2015-11-13 16:08:50 +00:00 |
|
Modmuss50
|
2331e3c35d
|
Fixes #255 and fixes #258
|
2015-11-12 21:38:11 +00:00 |
|
Modmuss50
|
61a600713a
|
Charge bench now supports higher teir items.
|
2015-11-12 21:28:49 +00:00 |
|
gigabit101
|
da631dd25e
|
Fixed Isidedness of Centrifuge closes #262
|
2015-11-12 21:01:36 +00:00 |
|
gigabit101
|
320d06e39e
|
Fixed Digital Chest not counting the ItemStack in output slot
|
2015-11-12 20:22:41 +00:00 |
|
gigabit101
|
d9654782fe
|
Fixed stack issue with Quantum/Digital Chest
|
2015-11-12 20:12:15 +00:00 |
|
Modmuss50
|
7e07320844
|
Removed unused imports
|
2015-11-12 19:50:20 +00:00 |
|
gigabit101
|
c2dcaf1902
|
Fixed Quantum Chest/Digital Chest stored items closes #247
|
2015-11-11 21:37:31 +00:00 |
|
Modmuss50
|
c120c37723
|
Fixes #250
|
2015-11-11 17:12:59 +00:00 |
|
Modmuss50
|
842fa421ae
|
Fixes #243
|
2015-11-11 17:00:18 +00:00 |
|
Modmuss50
|
e4760e559b
|
Fixes #249
|
2015-11-11 15:30:03 +00:00 |
|
Modmuss50
|
47a466ef21
|
Some fixes for #242
|
2015-11-11 15:24:13 +00:00 |
|
Modmuss50
|
7135075ac6
|
Removed power indicator on sawmill
|
2015-11-11 15:17:24 +00:00 |
|
modmuss50
|
ef03cf50a9
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
Conflicts:
src/main/java/techreborn/asm/LoadingPlugin.java
src/main/java/techreborn/client/gui/GuiBlastFurnace.java
src/main/java/techreborn/client/render/MultiblockRenderEvent.java
src/main/java/techreborn/compat/recipes/RecipesIC2.java
src/main/java/techreborn/init/ModItems.java
src/main/java/techreborn/lib/Location.java
src/main/java/techreborn/packets/PacketPipeline.java
src/main/java/techreborn/partSystem/fmp/CableConverter.java
|
2015-11-08 12:34:18 +00:00 |
|
modmuss50
|
8abf6e5282
|
Moved to RebornCore
|
2015-11-08 12:15:45 +00:00 |
|
Modmuss50
|
e93b29545e
|
You saw nothing :)
Just some debug code
|
2015-11-01 17:09:46 +00:00 |
|
modmuss50
|
50a830a101
|
Fixes #207
|
2015-11-01 16:45:58 +00:00 |
|
modmuss50
|
bffbd31cab
|
Sort of Revert "why was this done twice"
This reverts commit 363adeb681 .
Fixes #209
|
2015-11-01 16:24:35 +00:00 |
|
modmuss50
|
227d5fe19b
|
Fixes #214
|
2015-11-01 14:38:47 +00:00 |
|
modmuss50
|
50fa2e8a1d
|
Fixes #194
|
2015-10-22 18:19:05 +01:00 |
|
MrBretzel
|
94b0123a3b
|
Fixed #192
|
2015-10-22 13:34:11 +02:00 |
|
Modmuss50
|
2d3c6a8dec
|
Charge bench now uses new power system, also uses old one
|
2015-10-14 21:42:45 +01:00 |
|
modmuss50
|
13383bd2a9
|
Should fix #186
|
2015-10-10 16:42:21 +01:00 |
|
gigabit101
|
a8ea0f55e7
|
Removed a load of un needed junk from other versions of Gtech
|
2015-10-09 21:55:54 +01:00 |
|
Modmuss50
|
8a494a392c
|
Fixes #172
|
2015-10-08 08:24:48 +01:00 |
|
Modmuss50
|
7d052a3292
|
Removed last ic2 energy class
|
2015-10-07 08:20:45 +01:00 |
|
Modmuss50
|
3a9c469965
|
Fixes #171
|
2015-10-07 08:19:39 +01:00 |
|
Modmuss50
|
081f16a533
|
Removed Farm
|
2015-09-23 18:58:46 +01:00 |
|
modmuss50
|
47a8ccadcb
|
added backwards compatibility for block rotation
|
2015-09-19 09:38:19 +01:00 |
|
modmuss50
|
148715111f
|
Renamed TileMeta to TileRotation
|
2015-09-19 09:31:24 +01:00 |
|
Modmuss50
|
11fd755619
|
Fixed issues with the tank not syncing on the disel genertaor
|
2015-09-10 19:39:00 +01:00 |
|
Modmuss50
|
2cf90af757
|
Fixed #140
|
2015-09-10 17:41:59 +01:00 |
|
modmuss50
|
8aafd118f5
|
Added fluid power manager, imports from forestry and bc
|
2015-09-08 18:39:59 +01:00 |
|
gigabit101
|
61120ed30b
|
Added Ae2 and Logistic pipe support to Quantum Chest
|
2015-09-07 20:48:35 +01:00 |
|
Modmuss50
|
fe11409b4e
|
Fixed a load of crashes becuase of the new rotation system. Fixed powered tiles
|
2015-09-05 11:44:41 +01:00 |
|
Modmuss50
|
d3e860edb2
|
Inital port to tile based meta
|
2015-09-05 09:17:58 +01:00 |
|
modmuss50
|
d4c663ae72
|
fixes #116
|
2015-08-26 09:55:04 +01:00 |
|
modmuss50
|
ccb028a202
|
Tweaked thermal generator, closes #100
|
2015-08-16 12:17:02 +01:00 |
|
modmuss50
|
6d46a03e5d
|
Fixes #104 and #105
|
2015-08-13 12:47:55 +01:00 |
|
modmuss50
|
c63e9577fe
|
Fixed massive multi blocks
|
2015-08-10 22:27:40 +01:00 |
|
modmuss50
|
2ff03573d9
|
Added logic to alloy furnace
|
2015-08-10 19:28:52 +01:00 |
|
modmuss50
|
fb33dda932
|
Changes the way heat is calculated.
|
2015-08-10 14:32:01 +01:00 |
|
modmuss50
|
e0ab0af822
|
Reformatted all the code using the default intelji formatting options.
|
2015-08-09 11:05:32 +01:00 |
|
modmuss50
|
219aa69860
|
Fixed the IDSUManager crashing on startup and resetting the power values.
|
2015-07-27 19:18:42 +01:00 |
|
modmuss50
|
5927eaca4c
|
Recoded idsu, closes #81
|
2015-07-26 16:01:27 +01:00 |
|
modmuss50
|
e8bbbcc7c3
|
Some changes to the way rf is handled.
|
2015-07-25 17:55:03 +01:00 |
|
gigabit101
|
fb3855a078
|
closes #87
|
2015-07-24 23:18:30 +01:00 |
|
gigabit101
|
2d16b194e8
|
this might have been a issue at some point
|
2015-07-24 22:30:23 +01:00 |
|
gigabit101
|
bac2cdcbc6
|
closes #55
|
2015-07-24 22:29:00 +01:00 |
|
modmuss50
|
8725c5932d
|
It now gets to the main menu without ic2 :) o/ Next I need to fix the powered items.
|
2015-07-23 16:19:07 +01:00 |
|
modmuss50
|
496151fcae
|
Fixed aesu powers in creative tab, more work moving away from ic2 core and only needing ic2 api
|
2015-07-23 13:42:20 +01:00 |
|
modmuss50
|
e9ece63a99
|
Initial untested port to new internal power system.
This resets all the machines internal power buffer
|
2015-07-23 12:52:51 +01:00 |
|
modmuss50
|
984b502ded
|
fixes #85 , Fixes issues with RF output
|
2015-07-23 10:13:37 +01:00 |
|
gigabit101
|
ab72f7dced
|
Started adding progress bars to other machines
|
2015-07-21 17:53:43 +01:00 |
|
gigabit101
|
0880ffac72
|
Added configs to Aesu
|
2015-07-21 17:53:20 +01:00 |
|
modmuss50
|
663b5f2f75
|
Fixed some issues with the Industrial Electrolyzer
|
2015-07-20 15:38:36 +01:00 |
|
modmuss50
|
462aa20710
|
Fixed the BlastFurnace
|
2015-07-20 15:19:23 +01:00 |
|
modmuss50
|
d2b2f34d64
|
Some tweaks to the farm
|
2015-07-13 21:31:11 +01:00 |
|
modmuss50
|
ef5d81d8e2
|
Some more work on the farm
|
2015-07-13 16:24:50 +01:00 |
|
modmuss50
|
c160abf176
|
Started work on the farm, some changes to the idsu, its still broken
|
2015-07-13 13:54:44 +01:00 |
|
modmuss50
|
ab384b661a
|
Fixed lesu issue, temp remove rf output
|
2015-07-03 17:12:31 +01:00 |
|
modmuss50
|
10846270c5
|
Matterfab now needs scrap
|
2015-07-03 16:38:31 +01:00 |
|
gigabit101
|
26eff9bcbf
|
Removed fluid tank from IndustrialElectrolyzer closes #58
|
2015-07-02 23:39:36 +01:00 |
|
modmuss50
|
4ae1293535
|
Optimised all imports
|
2015-07-02 19:51:24 +01:00 |
|
modmuss50
|
a71b399765
|
Moved the lesu to the new system, looks like its stripping every thing ;'(
|
2015-07-01 20:34:22 +01:00 |
|
modmuss50
|
5b06a20351
|
Added ASM Method and Field stripper, more work on own power net
|
2015-07-01 16:41:40 +01:00 |
|