maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2766 commits 1 branch 0 tags 80 MiB
Commit graph

53 commits

Author SHA1 Message Date
modmuss50
26c208e811
Added license info to the header of all files. 2017-02-23 12:29:43 +00:00
Prospector
6a70424252 Continue the "Great refactor of 2017". Massive variable name refactoring and start splitting crafting table recipes to their own class. 2016-12-31 23:29:32 -08:00
ProfessorProspector
49f227ca81 MORE JSONS: UU matter, upgrades, scrapboxes, and rubber sapling! Also fix rubber sapling model 2016-12-11 17:27:39 -08:00
modmuss50
5dff31d937 A bunch more null check \o/ 2016-12-06 18:22:18 +00:00
modmuss50
2fdce5405b Improve block names 2016-12-05 09:40:55 +00:00
modmuss50
796df6c055
Auto Format code 2016-10-08 20:46:16 +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
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
be4f10b975 Energy storages item charging fixes, transformers fixes, electric items fixes. 2016-07-25 15:10: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
Yulife
341e862e37 Bunch of new item textures, move Lazurite to plates 
... and relocation of some assets
 2016-05-30 13:37:27 +02:00
modmuss50
4c5cf82db4 Rewrite ores 2016-05-16 15:48:48 +01: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
modmuss50
8c24711d4f Optimise imports 2016-03-15 08:13:05 +00:00
modmuss50
54c7827bb2 Fixes subitem rendering 2016-03-14 13:28:33 +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
modmuss50
67526480ad Added walia support for the cables 2016-03-07 20:33:08 +00:00
gigabit101
6549282ea0 Cleaned up imports 2016-02-26 13:03:30 +00:00
gigabit101
46cd99cdf5 Copper and Tin ore 2016-02-25 13:35:12 +00:00
modmuss50
fff846b512 RF power tool tips, tell me where I missed them 2016-02-24 21:10:44 +00:00
TheDoctorSoda
502fae9518 Fix rubber sapling texture 2016-02-21 18:42:36 -08:00
modmuss50
1f59226e01 Add some stuff, that does things 2016-02-20 19:46:18 +00:00
Modmuss50
30879a534a 859 2015-11-23 19:19:18 +00:00
Modmuss50
92ca6548c6 2211 2015-11-23 15:15:42 +00:00
Modmuss50
f0a70fa478 5235 2015-11-23 14:40:30 +00:00
Modmuss50
2c31b9211c Started work on the player detector. 2015-11-18 20:59:08 +00:00
modmuss50
8abf6e5282 Moved to RebornCore 2015-11-08 12:15:45 +00:00
modmuss50
e0ab0af822 Reformatted all the code using the default intelji formatting options. 2015-08-09 11:05:32 +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
4ae1293535 Optimised all imports 2015-07-02 19:51:24 +01:00
Gig
3688c7d838 Convert to ints 2015-06-19 17:54:52 +01:00
modmuss50
af9e9e535a Now stores eu when broken with a wrench. Added empty and full ones to creative tab. 2015-06-14 12:35:28 +01:00
joflashstudios
7cfaac1f61 Added Digital Chest, Computer Monitor 2015-06-06 22:11:13 -04: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
Gig
1f9600b33c Organized imports 
Changed centrifuge to new recipe system
 2015-05-19 23:00:36 +01:00
Gig
0dde18f7e0 getting things ready for achievements 2015-05-11 23:00:29 +01:00
Gig
4ac26ac086 Format 2015-04-24 14:20:09 +01:00
Gig
ae4f3b5814 Little more work on Achievements 2015-04-23 18:12:11 +01:00
Gig
4a3214320c Added Machine casings 
Added more textures
 2015-04-17 00:15:33 +01:00
Modmuss50
8e7d6b011e Auto formatted, and cleaned imports 2015-04-15 16:23:12 +01:00
Gig
f50f144b28 Added storage blocks 2015-04-12 20:21:33 +01:00
Gig
9b5a57bedb More recipes and organized imports 2015-04-12 20:04:12 +01:00
modmuss50
91495286db Clean imports 2015-04-12 09:45:31 +01:00
modmuss50
66c1e7ec34 quantumTank now holds fluid when broken with a wrench 2015-04-11 19:13:31 +01:00