-
696a535bd2
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
Stuart Pomeroy
2016-03-28 10:27:16 +0100
-
-
d0f27cb941
Add more scrapbox loot (and dev heads to the loot! woo)
Prospector
2016-03-28 02:24:15 -0700
-
fffeb93ff1
Fix Solar panels
Stuart Pomeroy
2016-03-28 10:09:26 +0100
-
123612acb9
Fix Merge
Stuart Pomeroy
2016-03-28 09:38:59 +0100
-
-
1993fa92bd
Add MFE GUI and made batterys charge and decharge?
Stuart Pomeroy
2016-03-28 09:34:48 +0100
-
cfb78eb126
Change Machine Block textures, energy crystals, and advanced alloy texture
Prospector
2016-03-28 01:28:05 -0700
-
e31cbae97a
No longer electrocutes players in creative mode
Prospector
2016-03-28 01:27:34 -0700
-
3df24a1831
Add tools/armour to creative tab
Prospector
2016-03-28 01:26:54 -0700
-
-
dd6af0d09b
Textures for previous commit
Prospector
2016-03-27 22:48:42 -0700
-
28fd887ee3
Ruby, sapphire, and peridot armour
Prospector
2016-03-27 22:48:31 -0700
-
a636da1882
Bronze Tools and Armour
Prospector
2016-03-27 21:20:27 -0700
-
877308a75c
Some small tweaks
modmuss50
2016-03-27 19:23:38 +0100
-
dfb7d0afd4
Fix Merges
Stuart Pomeroy
2016-03-27 20:14:13 +0100
-
-
f4b32cfcef
closes #432
gigabit101
2016-03-27 20:11:39 +0100
-
78e8acce7b
Fixed some GUIS and some Mass Fabs
Stuart Pomeroy
2016-03-27 20:10:49 +0100
-
da4f8fcb4d
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
gigabit101
2016-03-27 20:08:55 +0100
-
-
ea9b92139e
closes #431
gigabit101
2016-03-27 20:08:51 +0100
-
52ffbd65df
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
modmuss50
2016-03-27 18:56:37 +0100
-
-
-
-
2360df0148
closes #429
gigabit101
2016-03-27 19:53:55 +0100
-
33c8386324
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
gigabit101
2016-03-27 19:40:22 +0100
-
-
d0289037dc
Added WIP tag to book
gigabit101
2016-03-27 19:40:10 +0100
-
1ab2415e40
Fix crash, fix #414 and fix #411
modmuss50
2016-03-27 18:56:27 +0100
-
-
aeb567deb7
Fixes #416
modmuss50
2016-03-27 18:38:43 +0100
-
-
aceceb7d2d
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
modmuss50
2016-03-27 18:21:42 +0100
-
-
576f204ce0
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
Prospector
2016-03-27 11:15:08 -0700
-
-
40a10cafd9
Localize cable tooltips
Prospector
2016-03-27 11:14:59 -0700
-
2801535bf8
Fixes #426
modmuss50
2016-03-27 18:21:31 +0100
-
-
-
49e45b27e2
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
modmuss50
2016-03-27 18:06:50 +0100
-
-
c73d1dc773
closes #425
gigabit101
2016-03-27 19:05:05 +0100
-
-
8261384cdd
Fixes #420
modmuss50
2016-03-27 18:06:40 +0100
-
-
cd8de44e79
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
modmuss50
2016-03-27 17:58:52 +0100
-
-
b08ca6b91c
Diesel and Semifluid generator GUI textures
Prospector
2016-03-27 10:57:31 -0700
-
5846f1c784
Remove debug code, and 1.0.2
modmuss50
2016-03-27 17:58:41 +0100
-
-
5dad8067eb
Hide fluids from JEI
Prospector
2016-03-27 10:30:32 -0700
-
-
9ea37a0799
Merge pull request #415 from Rushmead/1.9
Gigabit101
2016-03-27 18:28:13 +0100
-
-
525a91e931
Fixes solar panels being powered wierdly...
Stuart Pomeroy
2016-03-27 18:25:45 +0100
-
99f9fc4903
Merge pull request #409 from Rushmead/1.9
Gigabit101
2016-03-27 17:45:09 +0100
-
-
8fba82312c
Closes #402,#404,406
Stuart Pomeroy
2016-03-27 17:41:56 +0100
-
-
96464980c2
Fixed crash when not running with MCMP
modmuss50
2016-03-27 13:14:57 +0100
-
a0dea07407
Fix multiblocks
modmuss50
2016-03-27 12:51:39 +0100
-
02931939b6
Update mc multipart for new forge
modmuss50
2016-03-26 18:52:30 +0000
-
7ea1f438c1
Fix running in dev
modmuss50
2016-03-26 18:41:09 +0000
-
6616d72304
Update build.gradle
Modmuss50
2016-03-26 18:11:47 +0000
-
891ff1d2ed
Merge pull request #397 from Rushmead/1.9
Modmuss50
2016-03-26 17:19:12 +0000
-
-
aad396e1b4
Revert "Merged branch 1.9 into 1.9"
Stuart Pomeroy
2016-03-26 17:16:27 +0000
-
d142704a15
Merged branch 1.9 into 1.9
Stuart Pomeroy
2016-03-26 17:16:27 +0000
-
-
77818b609e
Fix Grinder GUI
Stuart Pomeroy
2016-03-26 17:16:09 +0000
-
-
a284c45475
Fix Grinder GUI
Stuart Pomeroy
2016-03-26 17:05:44 +0000
-
267ac7b8a2
Fixed Grinder GUI and other?
Stuart Pomeroy
2016-03-26 16:59:12 +0000
-
4861364cd6
blocks are hard ;)
gigabit101
2016-03-26 16:17:56 +0000
-
ee16097339
Merge pull request #395 from Rushmead/1.9
Modmuss50
2016-03-26 16:05:14 +0000
-
-
ba2ad6aa4e
FIX IT AGAIN!
Stuart Pomeroy
2016-03-26 16:03:23 +0000
-
37ba3e29c0
Fix PR
Modmuss50
2016-03-26 16:01:14 +0000
-
c4345bacae
Fix a fuck up.
Stuart Pomeroy
2016-03-26 16:01:06 +0000
-
d5a49b4c59
Merge pull request #394 from Rushmead/1.9
Modmuss50
2016-03-26 15:59:34 +0000
-
-
6498bd1974
Update to forge and fuck up the cables? Not sure :P
Stuart Pomeroy
2016-03-26 15:58:38 +0000
-
-
bc5c30dd3a
Update build.gradle
Modmuss50
2016-03-26 08:52:30 +0000
-
5eed5b161d
Code formatter take 2
modmuss50
2016-03-25 09:47:34 +0000
-
33985f1a31
Revert "Added code formatter"
modmuss50
2016-03-24 00:41:47 +0000
-
b9448d5d90
Added code formatter
modmuss50
2016-03-24 00:39:26 +0000
-
710f9c04e7
gui fixs
gigabit101
2016-03-23 23:31:40 +0000
-
1a580bb1d1
Fixed guis
gigabit101
2016-03-23 21:36:58 +0000
-
887708d128
Fixed player detector crash
modmuss50
2016-03-23 20:10:08 +0000
-
244ade085d
Some small fixes
modmuss50
2016-03-23 20:00:00 +0000
-
a56bc65f3f
Remove alpha tag
modmuss50
2016-03-23 19:03:23 +0000
-
a1078a4951
Added WIP tool tip
modmuss50
2016-03-23 18:59:39 +0000
-
1d9fe100b1
Recipes and debug texture
gigabit101
2016-03-23 18:45:58 +0000
-
ad2c34e969
Textures
gigabit101
2016-03-23 18:21:55 +0000
-
a999d5064a
another recipe
gigabit101
2016-03-23 18:19:42 +0000
-
f31d50c81e
added missing loc
gigabit101
2016-03-23 18:19:34 +0000
-
5c7035c389
Added a but ton of recipes
gigabit101
2016-03-23 18:17:37 +0000
-
4d55b94a0a
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
modmuss50
2016-03-23 18:08:45 +0000
-
-
d9eded60cc
Remove explode sub command
modmuss50
2016-03-23 18:08:29 +0000
-
bd37e8ad7f
3D Wrench
gigabit101
2016-03-23 17:05:21 +0000
-
-
8f3b3ede78
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
modmuss50
2016-03-23 17:02:34 +0000
-
-
f0d6b9e78d
Can now place blocks facing up and down
modmuss50
2016-03-23 17:02:21 +0000
-
8945aa1634
Added missing localizations
gigabit101
2016-03-23 17:00:41 +0000
-
-
17ff9b2aad
some texture fixs
gigabit101
2016-03-23 16:53:32 +0000
-
fffcecbb98
Revert "Removed bucket textures as it now generates them at runtime"
modmuss50
2016-03-23 11:37:30 +0000
-
4fa52983d5
Version 1.0.0-Alpha1
Modmuss50
2016-03-23 00:21:15 +0000
-
6d1a8a835e
more gui things
gigabit101
2016-03-22 23:58:16 +0000
-
123e704caf
fixed some machine drops
gigabit101
2016-03-22 23:34:43 +0000
-
42015809a3
some missing localizations
gigabit101
2016-03-22 23:30:08 +0000
-
5ea4dedcb2
Fixed some progress bars
gigabit101
2016-03-22 23:27:35 +0000
-
ab19d71ede
Moved shields to RebornCore
modmuss50
2016-03-22 20:30:59 +0000
-
eec6139d33
Update forge + powernet improvements
modmuss50
2016-03-22 20:03:46 +0000
-
b41472089c
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
modmuss50
2016-03-22 11:39:20 +0000
-
-
3d8c63e1f2
Clean up maven repos
modmuss50
2016-03-22 11:38:41 +0000
-
2afb906775
Update build.gradle
Modmuss50
2016-03-22 00:48:46 +0000
-
-
1c297634d7
Some fixes??
modmuss50
2016-03-21 20:37:08 +0000
-
0c85662e14
derp, fix compile
modmuss50
2016-03-21 19:46:49 +0000
-
aa64b1a8d6
Added more walia support, fix building
modmuss50
2016-03-21 19:45:48 +0000
-
4f3d9ddfca
Shields
modmuss50
2016-03-21 19:36:54 +0000
-
32027f948c
Re added waila support for blocks
gigabit101
2016-03-21 16:56:20 +0000
-
1acdc13e2d
Guis for batbox, mfe, mfsu
gigabit101
2016-03-21 15:52:46 +0000
-
cb42f452c4
Update MCMP
modmuss50
2016-03-21 15:32:35 +0000
-
8f382f2239
stuff and things
gigabit101
2016-03-21 15:30:32 +0000
-
dfbc4045e6
Update README.md
Modmuss50
2016-03-20 23:13:28 +0000
-
5fde39ebcd
Some improvements to things
modmuss50
2016-03-20 21:23:12 +0000
-
fee31761b1
Fix NPE
modmuss50
2016-03-20 19:51:41 +0000