TheDoctorSoda
|
dd7b3ef157
|
Merge pull request #2 from TechReborn/1.8.9
Update Fork
|
2016-02-20 12:18:22 -08:00 |
|
modmuss50
|
1f59226e01
|
Add some stuff, that does things
|
2016-02-20 19:46:18 +00:00 |
|
TheDoctorSoda
|
fe216fba03
|
Merge pull request #1 from TechReborn/1.8.9
Pull stuff
|
2016-02-20 10:42:44 -08:00 |
|
modmuss50
|
0ac86ff303
|
Added sapling
|
2016-02-20 18:40:35 +00:00 |
|
TheDoctorSoda
|
d3c3f3edcf
|
Might've fixed tiling issue w/ rubber
|
2016-02-20 10:39:32 -08:00 |
|
TheDoctorSoda
|
44a60d984a
|
Rubber sapling
|
2016-02-20 10:29:03 -08:00 |
|
TheDoctorSoda
|
765475bee7
|
Changed rubber textures
|
2016-02-20 09:58:03 -08:00 |
|
modmuss50
|
891d2cce32
|
Added rubber processing
|
2016-02-20 10:58:58 +00:00 |
|
gigabit101
|
defde302fe
|
Added machine block recipe last commit for night
|
2016-02-20 03:57:15 +00:00 |
|
gigabit101
|
ee2841b5b1
|
Added machine blocks
|
2016-02-20 03:47:35 +00:00 |
|
gigabit101
|
f947ef37a4
|
Added basic battery and fixed issues with Lithium Battery
|
2016-02-20 03:35:20 +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
|
aa41d576e3
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-02-20 00:58:02 +00:00 |
|
gigabit101
|
8ad4a45716
|
Added basic Grinder
|
2016-02-20 00:57:57 +00:00 |
|
modmuss50
|
a76384504f
|
Rubber Trees
|
2016-02-20 00:55:18 +00:00 |
|
modmuss50
|
9a585bcfb2
|
Merge branch '1.7.10' into 1.8.9
Conflicts:
build.gradle
src/main/java/techreborn/blocks/BlockOre.java
src/main/java/techreborn/items/ItemCells.java
|
2016-02-16 13:49:25 +00:00 |
|
modmuss50
|
c0ebf03f72
|
fixes #326
|
2016-02-16 09:20:26 +00:00 |
|
modmuss50
|
4585684fe2
|
Removed bucket textures as it now generates them at runtime
|
2016-02-02 21:22:51 +00:00 |
|
mezz
|
4b804c3521
|
Add alloy furnace recipes
|
2015-12-30 21:17:20 -08:00 |
|
mezz
|
181498e132
|
Clean up JEI Integration
|
2015-12-30 20:09:06 -08:00 |
|
modmuss50
|
0d4b9afd01
|
All Items now have textures
|
2015-11-27 20:17:12 +00:00 |
|
Modmuss50
|
285176e171
|
Large handfull of textures.
|
2015-11-26 21:48:30 +00:00 |
|
Modmuss50
|
2c31b9211c
|
Started work on the player detector.
|
2015-11-18 20:59:08 +00:00 |
|
Modmuss50
|
08cbe33f00
|
Fixes #263
|
2015-11-18 20:14:46 +00:00 |
|
Mazdallier
|
6efa1de164
|
Update fr_FR.lang
all done
|
2015-11-17 10:22:27 +01:00 |
|
Modmuss50
|
f42c127201
|
Added basic fustion reactor multiblock checking.
|
2015-11-16 15:20:19 +00:00 |
|
Mazdallier
|
81b45789ac
|
Update fr_FR.lang
big update to continuous line 695
|
2015-11-16 15:40:43 +01:00 |
|
Modmuss50
|
100293fb8e
|
Started work on reactor.
|
2015-11-16 13:36:44 +00:00 |
|
Modmuss50
|
9b1378a64c
|
Fixes #269
|
2015-11-15 21:12:31 +00:00 |
|
Modmuss50
|
df5bd1422a
|
Fixes #267
|
2015-11-15 20:54:31 +00:00 |
|
gigabit101
|
421597fbab
|
Added missing localizations closes #242
|
2015-11-13 16:48:51 +00:00 |
|
gigabit101
|
0ebf0c95dd
|
more charge slots
|
2015-11-13 16:29:35 +00:00 |
|
Modmuss50
|
08a3636e72
|
Fixes #260
|
2015-11-12 21:00:03 +00:00 |
|
Modmuss50
|
5419067213
|
Work for #242
|
2015-11-12 08:32:14 +00:00 |
|
Modmuss50
|
842fa421ae
|
Fixes #243
|
2015-11-11 17:00:18 +00:00 |
|
Modmuss50
|
47a466ef21
|
Some fixes for #242
|
2015-11-11 15:24:13 +00:00 |
|
Modmuss50
|
701c658323
|
Fixes all of #242
|
2015-11-11 13:17:14 +00:00 |
|
MrBretzel
|
1307406e10
|
Adding iron alloy smelter to not enough items and fix ChargedHud possible crash
|
2015-11-01 23:10:32 +01:00 |
|
gigabit101
|
57b85450e6
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-11-01 16:55:02 +00:00 |
|
gigabit101
|
206d09ed31
|
Added a bunch more localization
|
2015-11-01 16:54: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 |
|
MrBretzel
|
28b0a5da8c
|
Move to png
Fix bug
|
2015-10-25 08:14:08 +01:00 |
|
MrBretzel
|
67398ca163
|
Move to jpeg
just a bug...
|
2015-10-25 08:13:38 +01:00 |
|
modmuss50
|
81c498086a
|
closes #176
|
2015-10-10 16:51:56 +01:00 |
|
gigabit101
|
a8ea0f55e7
|
Removed a load of un needed junk from other versions of Gtech
|
2015-10-09 21:55:54 +01:00 |
|
gigabit101
|
5a230b20a2
|
Fix's #185
|
2015-10-09 21:10:20 +01:00 |
|
Modmuss50
|
caca45d86b
|
Removed Iron Gear Texture
|
2015-10-07 16:09:14 +01:00 |
|
Modmuss50
|
75e2bd4733
|
Machines now explode when they come in contact with rain.
|
2015-10-07 15:41:26 +01:00 |
|
modmuss50
|
c30633b5d3
|
Added config for disabling connected textures
|
2015-10-02 21:09:57 +01:00 |
|
modmuss50
|
219570f288
|
Added connected textures to reinforced casing
|
2015-09-26 16:21:50 +01:00 |
|
modmuss50
|
f889b9a051
|
Some crappy textures, adds all connected textures
|
2015-09-26 15:54:25 +01:00 |
|
modmuss50
|
79d6f81dda
|
Some texture work on the new connected textures
|
2015-09-26 13:09:39 +01:00 |
|
gigabit101
|
97d990e316
|
small changes to PDA and a start on PdaConfig
|
2015-09-23 18:29:34 +01:00 |
|
Modmuss50
|
3f4b59faaf
|
Fixes #130
|
2015-09-23 17:27:41 +01:00 |
|
Modmuss50
|
c424e74473
|
closes #146
|
2015-09-16 08:24:58 +01:00 |
|
Modmuss50
|
dc1259c9f6
|
Fixed some textures
|
2015-09-15 18:26:29 +01:00 |
|
modmuss50
|
e02b1518d2
|
updates to the aesu gui
|
2015-09-05 21:09:37 +01:00 |
|
Nagisa·Jang
|
af3b605b24
|
Update zh_CN.lang
|
2015-09-02 21:34:09 +08:00 |
|
Nagisa·Jang
|
827cf6f969
|
Update zh_CN.lang
|
2015-08-30 20:02:07 +08:00 |
|
modmuss50
|
21628a78cb
|
auto optimise png files
|
2015-08-27 16:47:32 +01:00 |
|
modmuss50
|
cb59fff1f0
|
fixes #126 and fixes #127
|
2015-08-26 09:52:56 +01:00 |
|
modmuss50
|
e7f85022a4
|
Merge branch 'master' of https://github.com/Amamiya-Nagisa/TechReborn into Amamiya-Nagisa-master
Conflicts:
src/main/resources/assets/techreborn/lang/zh_CN.lang
|
2015-08-25 18:23:43 +01:00 |
|
Nagisa·Jang
|
e5f23dc073
|
Update zh_CN.lang
|
2015-08-23 22:08:24 +08:00 |
|
gigabit101
|
73b85de0ae
|
fix pda gui texture
|
2015-08-17 18:45:34 +01:00 |
|
gigabit101
|
8233f1ec8f
|
color change a format
|
2015-08-17 18:44:54 +01:00 |
|
gigabit101
|
7f889958a2
|
Cleaner gui
|
2015-08-17 15:15:22 +01:00 |
|
gigabit101
|
388dfc016d
|
More small changes to pda
|
2015-08-16 21:29:12 +01:00 |
|
gigabit101
|
25aeaf371e
|
added recipe for PDA
|
2015-08-16 21:19:27 +01:00 |
|
modmuss50
|
44c5037b28
|
Added config settings for power net, closes #112
|
2015-08-15 17:03:28 +01:00 |
|
primetoxinz
|
0ac12866e2
|
couple more textures
|
2015-08-13 16:58:31 -04:00 |
|
primetoxinz
|
acfa840120
|
Fix most texture names
|
2015-08-13 16:53:37 -04:00 |
|
primetoxinz
|
fb38973684
|
actually fixes it
|
2015-08-13 16:52:55 -04:00 |
|
primetoxinz
|
bd90b40db6
|
fix hot tungsten steel texture
|
2015-08-13 16:41:47 -04:00 |
|
gigabit101
|
7f86d116cb
|
fixed pda texture
|
2015-08-10 18:31:07 +01:00 |
|
gigabit101
|
f58fbfe0e8
|
Added alot of work on the PDA still {WIP}
|
2015-08-10 18:30:19 +01:00 |
|
modmuss50
|
404bbf6797
|
Fixed #101
|
2015-08-09 16:45:17 +01:00 |
|
TehporP
|
24a68bd292
|
Update zh_CN.lang
|
2015-08-09 13:21:53 +08:00 |
|
TehporP
|
7dc3a50b1c
|
Update zh_CN.lang
|
2015-08-09 09:04:50 +08:00 |
|
TehporP
|
31c17617b6
|
Update zh_CN.lang
|
2015-08-09 08:58:52 +08:00 |
|
TehporP
|
c970ec3445
|
Update zh_CN.lang
|
2015-08-09 08:36:21 +08:00 |
|
Nagisa·Jang
|
74cb2a4107
|
Update zh_CN.lang
|
2015-08-08 22:43:49 +08:00 |
|
TehporP
|
a1551967ec
|
Create zh_CN.lang
I will start translating job a bit later
|
2015-08-08 08:54:24 +08:00 |
|
modmuss50
|
9e346e6061
|
Added machine parts, added some recipes. Fixes #92
|
2015-08-05 15:35:06 +01:00 |
|
modmuss50
|
f8803f3be1
|
Removed the univseral jar appendix, fixed small typo
|
2015-08-05 10:13:05 +01:00 |
|
gigabit101
|
bac2cdcbc6
|
closes #55
|
2015-07-24 22:29:00 +01:00 |
|
Mazdallier
|
c1643152a9
|
Update fr_FR.lang
|
2015-07-23 16:38:02 +02:00 |
|
modmuss50
|
984b502ded
|
fixes #85 , Fixes issues with RF output
|
2015-07-23 10:13:37 +01:00 |
|
modmuss50
|
d2b2f34d64
|
Some tweaks to the farm
|
2015-07-13 21:31:11 +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 |
|
Mazdallier
|
e4cfa69ba1
|
Update fr_FR.lang
config update
|
2015-07-08 14:08:56 +02:00 |
|
gigabit101
|
26eff9bcbf
|
Removed fluid tank from IndustrialElectrolyzer closes #58
|
2015-07-02 23:39:36 +01:00 |
|
modmuss50
|
b7a9824cd3
|
Added config setting for eu/rf value
|
2015-07-02 23:35:10 +01:00 |
|
Mazdallier
|
c2e77df0b1
|
Update fr_FR.lang
|
2015-07-02 13:16:40 +02:00 |
|
modmuss50
|
c836e06678
|
Fixed mcmod.info stuff not getting replaced, removed the appendix on the file name because it was not needed
|
2015-07-01 16:53:03 +01:00 |
|
Gig
|
a063e13612
|
It works!!!
Charge bench now working needs a texture and recipe
|
2015-06-29 18:42:20 +01:00 |
|
Gig
|
bfe0d57bc7
|
Started on ChargeBench only slot 0 works atm
|
2015-06-29 18:03:40 +01:00 |
|
Gig
|
f2a67a60d4
|
Added localization to fluids closes #56
|
2015-06-29 15:53:54 +01:00 |
|
Gig
|
86829e8672
|
Fixed some missing localization
|
2015-06-27 16:06:46 +01:00 |
|
Gig
|
c11086243b
|
Missing Multiblock message can now be localized
|
2015-06-26 01:28:18 +01:00 |
|
Gig
|
c6bc7f6fb8
|
Little more work on pda lots more to do
|
2015-06-20 11:24:04 +01:00 |
|
modmuss50
|
63fa58eb24
|
Added average eu change to the aesu.
|
2015-06-14 12:15:24 +01:00 |
|
Universal
|
8a2119d5d2
|
Made destructopack work
|
2015-06-14 01:13:09 +02:00 |
|
Tntrololol
|
a6fcd15082
|
Added item for saw dust
|
2015-06-12 18:49:32 -05:00 |
|
Tntrololol
|
d4a0fddaf9
|
Created new textures for AESU, IDSU, and LESU
|
2015-06-11 17:05:05 -05:00 |
|
Tntrololol
|
df7199d113
|
Gave the Industrial Sawmill a front texture
|
2015-06-11 15:06:21 -05:00 |
|
Matthew
|
6829e27588
|
Update mcmod.info
http://i.imgur.com/QdTxHio.jpg
|
2015-06-11 09:49:17 -04:00 |
|
Tntrololol
|
45448c296f
|
Added IC2 style GUI textures for AESU, IDSU, and LESU.
|
2015-06-10 23:24:39 -05:00 |
|
joflashstudios
|
162859baa6
|
Some updates to mcmod.info
|
2015-06-08 02:20:58 -04:00 |
|
joflashstudios
|
601812a10c
|
Added OreDrop API
|
2015-06-07 23:55:58 -04:00 |
|
joflashstudios
|
d3c2929807
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-06-07 15:55:54 -04:00 |
|
joflashstudios
|
2f59ca1b84
|
Added computercube and lapotronic energy orb
|
2015-06-07 15:55:23 -04:00 |
|
Gig
|
49c80a9f1b
|
Changed texture for LapotronPack
|
2015-06-07 20:36:09 +01:00 |
|
Gig
|
c78191d9f1
|
Broken
|
2015-06-07 20:35:00 +01:00 |
|
Gig
|
70cd363656
|
On Icons for a load of machines
|
2015-06-07 19:39:21 +01:00 |
|
Tntrololol
|
d9e219054e
|
Merge remote-tracking branch 'origin/master'
|
2015-06-07 13:06:08 -05:00 |
|
Tntrololol
|
af65c885b1
|
Added proper textures to heat generator
|
2015-06-07 13:05:53 -05:00 |
|
modmuss50
|
23bf14b37d
|
Clean the sawmill gui a bit, and remove debug code
|
2015-06-07 18:58:31 +01:00 |
|
joflashstudios
|
7cfaac1f61
|
Added Digital Chest, Computer Monitor
|
2015-06-06 22:11:13 -04:00 |
|
joflashstudios
|
b01399f2b5
|
Fixed helium coolant cell textures.
|
2015-06-06 15:57:53 -04:00 |
|
joflashstudios
|
71c445d1ed
|
Fixed tetrahedrite ore texture. This gets rid of the different texture per-side feature, because it's incompatible with the ore texture loader we're using. I don't think it's worth writing custom code just so tetrahedrite can have more than one texture.
|
2015-06-06 15:37:52 -04:00 |
|
joflashstudios
|
4c018dc7ad
|
Added textures for all TechReborn fluids.
|
2015-06-06 15:34:54 -04:00 |
|
joflashstudios
|
48dd12aa5a
|
Added gas turbine. Still missing recipe and some config elements.
|
2015-06-05 16:24:52 -04:00 |
|
Yves
|
8c2d626729
|
Update fr_FR.lang
waitting for testing your mod after this last (but not least) update.
|
2015-05-27 13:55:25 +02:00 |
|
Yves
|
64a82a11b4
|
Update fr_FR.lang
this is the turn off all small ans tiny dust, ingot and nugget, ore crushed, rod and plate
|
2015-05-27 12:09:01 +02:00 |
|
Yves
|
54677cad5e
|
Create fr_FR.lang
|
2015-05-26 14:54:49 +02:00 |
|
Tntrololol
|
7ad96faa21
|
Added new storage blocks and textures
|
2015-05-22 17:37:10 -05:00 |
|
Tntrololol
|
e9b1280a13
|
Added 5 additional types of machine hulls and their respective textures
|
2015-05-22 15:02:02 -05:00 |
|
Tntrololol
|
cdf8f3e0a3
|
Added GUI elements to the Industrial Grinder
|
2015-05-21 18:04:34 -05:00 |
|
Tntrololol
|
2278e2ab3e
|
Added GUI progress bar to the Chemical Reactor
|
2015-05-20 17:34:41 -05:00 |
|
Tntrololol
|
4bd43b861c
|
Added GUI progress bar to the Industrial Centrifuge
|
2015-05-20 16:43:46 -05:00 |
|
Gig
|
cfc71d48b2
|
Added machine block for stand alone recipes
|
2015-05-17 01:37:03 +01:00 |
|
Gig
|
fc11db09cc
|
Added bucket textures to items
|
2015-05-15 17:05:18 +01:00 |
|
Tntrololol
|
fdec643bbb
|
Added bucket textures
|
2015-05-13 17:31:48 -05:00 |
|
Tntrololol
|
65dd53c6ec
|
Added machine GUI progress bars
|
2015-05-12 13:26:23 -05:00 |
|
Tntrololol
|
f3d346f6d1
|
Added fuel rod textures
|
2015-05-11 16:07:02 -05:00 |
|
Tntrololol
|
438541dfa4
|
Fixed missing textures and localizations
|
2015-05-11 15:59:24 -05:00 |
|
Tntrololol
|
792ab032ba
|
Fixed/Updated GUIs
|
2015-05-10 15:39:19 -05:00 |
|
Gig
|
ee0844bd0c
|
Added HeatGenerator
|
2015-05-10 16:42:01 +01:00 |
|
Tntrololol
|
350580d76e
|
Merge remote-tracking branch 'origin/master'
|
2015-05-09 18:42:25 -05:00 |
|
Tntrololol
|
60ce6187f1
|
Added another massive amount of localizations
|
2015-05-09 18:42:11 -05:00 |
|
Gig
|
50c2599305
|
Littlie more work on AESU
|
2015-05-09 20:47:05 +01:00 |
|
Gig
|
3d92772004
|
Basic work on Aesu
|
2015-05-09 20:19:40 +01:00 |
|
Gig
|
266c547520
|
Small fix's to multiple things
|
2015-05-09 18:51:31 +01:00 |
|
Gig
|
d3d1bb8060
|
Finished on buckets
|
2015-05-09 17:52:37 +01:00 |
|
Gig
|
7e8b236558
|
Added all the fluids
|
2015-05-09 16:11:48 +01:00 |
|
Tntrololol
|
48280690f5
|
Fixed a bunch of localizations
|
2015-05-08 23:59:10 -05:00 |
|
Gig
|
55656c13a5
|
More fluid stuff
|
2015-05-09 02:15:38 +01:00 |
|
Gig
|
1ae5a20517
|
More fluid stuff lot more TODO
|
2015-05-09 00:36:55 +01:00 |
|
Gig
|
77634fafd3
|
Start on fluid system
|
2015-05-08 23:53:58 +01:00 |
|