97b25628d6
Compatibility with TE and IC2.Everything should work perfectly, only
...
tested IC2 so far.
2014-02-20 19:41:56 +02:00
1be5bfd680
Updated COFH API.Work on integrating with TE.
2014-02-20 18:34:38 +02:00
d222ca0086
Merge pull request #21 from decebaldecebal/master
...
Work on integration between power systems.
2014-02-20 17:21:14 +02:00
9f5d7ad97d
Removed UE API.
2014-02-19 19:53:28 +02:00
e1c4e136b8
Work on integration between power systems.
...
Deleted TileEntityMod (obsolete)
Implemented proper TileEntityMachine, base tile for all the machines.
Moved Buildcraft API to its proper location.
Added EnergyUtils class that contains utilities for interacting with
energy.
2014-02-19 18:50:04 +02:00
a0b5d96da3
Began work on a Guide Book for SC2
2014-02-18 21:01:25 -05:00
988aaa7d8e
Merge pull request #1 from BrassGoggledCoders/nightly
...
Nightly
2014-02-17 18:26:02 -05:00
14851f0ae2
Merge pull request #19 from warlordjones/master
...
For the last damn time, add Smog already!
2014-02-17 18:23:06 -05:00
b1bdd31c11
For the last damn time, add Smog already!
2014-02-17 23:16:36 +00:00
508b7dd03a
Merge pull request #16 from MrArcane111/master
...
Updated README
2014-02-17 17:46:43 -05:00
c8327bbfc2
Updated README
2014-02-17 17:45:23 -05:00
140d5a8ff2
Merge pull request #15 from MrArcane111/master
...
Bleeding edge updates
2014-02-17 17:40:59 -05:00
fa637355da
Uhhh...
2014-02-17 17:39:24 -05:00
bbed815cd6
Merge pull request #14 from BrassGoggledCoders/nightly
...
Merge pull request #13 from BrassGoggledCoders/master
2014-02-17 17:23:34 -05:00
50c69d8de6
Merge pull request #13 from BrassGoggledCoders/master
...
Stuff
2014-02-17 17:22:42 -05:00
156f5ff2ac
Merge pull request #12 from BrassGoggledCoders/nightly
...
Nightly
2014-02-17 17:20:12 -05:00
6e2ada4b80
Update Readme.md
2014-02-17 21:58:29 +00:00
27d95aa040
Revert 5299b28..96cdad5
...
This rolls back to commit 5299b28c52
2014-02-17 21:44:53 +00:00
96cdad5719
Merge pull request #9 from BrassGoggledCoders/MrArcane111-nightly
...
Mr arcane111 nightly
2014-02-17 21:41:04 +00:00
6bff96c644
Conflict Fixing (hopefully)
2014-02-17 21:39:03 +00:00
f5d0a27448
Merge pull request #7 from BrassGoggledCoders/maindir
...
Merge in the maindir to the master
2014-02-17 16:24:00 -05:00
e78171c522
Added Smog!
2014-02-17 21:19:36 +00:00
36cd393da0
Refactoring; cleanup; changed how canisters function; added clockwork
...
base items; began working on API; began adding Basic Steam Boiler; began
adding Steam Pipes; many errors: need HELP!; added Timer, Effect, Model
utils just for you! ;)
2014-02-17 16:16:19 -05:00
5299b28c52
Fixed my derpy Ore Gen crash
...
Oops!
2014-02-17 21:04:23 +00:00
3e9bc10043
Merge branch 'merge' into nightly
2014-02-17 20:35:00 +00:00
cdda3ac8fa
Added my Ingots!
...
+ That last commit lied. I added orespawning in this commit, not the
last one
! Delete your old configs, or face the errors!
! Again, no names/textures yet…
2014-02-17 20:22:51 +00:00
1a3a1ff0b2
Made the SteamDrill work on Gravel...
2014-02-17 20:21:34 +00:00
31ddb176d8
Change Ray Gun beam colour to Green!
...
It was bugging me that the ray gun 'crystal' was green, but the emitted beam was red...
2014-02-17 20:04:33 +00:00
44fc5814c6
Added my MetalBlocks
...
+ Began transfer to lang file
+ Made my Ores generate
* had to refix the proxy for some reason.
! Nothing is named or textured properly yet. Not to worry, that will
come later!
2014-02-17 20:01:06 +00:00
be34ef0bdb
Merge pull request #4 from decebaldecebal/nightly
...
Merge Pull Request "New UE API and bodifications to electric based items/blocks."
2014-02-17 14:30:49 +00:00
c3da6f9ae8
Added my Ores
...
+ Aluminum, Copper, Tin, Zinc
+ Registered these and existing ores in ore dictionary
2014-02-17 14:28:59 +00:00
181883919b
New UE API and bodifications to electric based items/blocks.
2014-02-17 16:28:06 +02:00
e7f79a163f
New ray gun features! (and fixed proxy)
...
+ Particles!
+ Melts sand into glass
+ Melts netherrack into lava
+ Hardens clay
+ Melts water into snow
+ Melts ice
+ Evaporates water
2014-02-17 09:59:15 +00:00
a32b868ea2
Merge pull request #3 from MrArcane111/maindir
...
Maindir
2014-02-16 14:47:44 -05:00
073bef93d8
Merge pull request #3 from MrArcane111/master
...
Info update
2014-02-16 14:47:18 -05:00
1e7ebbb4e4
Merge pull request #2 from MrArcane111/nightly
...
Merge pull request #1 from MrArcane111/master
2014-02-16 14:46:16 -05:00
ddef4424a7
Merge pull request #2 from MrArcane111/nightly
...
Nightly
2014-02-16 14:45:26 -05:00
a8a2e7dd1a
Merge pull request #1 from MrArcane111/master
...
Important info added: PLEASE READ!
2014-02-16 14:45:05 -05:00
67caf8e51b
Merge pull request #1 from MrArcane111/master
...
Important info added: PLEASE READ!
2014-02-16 14:43:50 -05:00
bbc77908d4
Important info added: PLEASE READ!
2014-02-16 14:41:15 -05:00
491556e720
Step 1: Assets Merge
...
Because that’s the easy bit. And, no, I don’t plan to sleep!
2014-02-16 00:34:52 +00:00
d35b5bc456
A LOT of refactoring/cleanup; please read the TO-DO list in the SC2.java
...
file; also, please ignore the error in the TileEntityCompressor file
2014-02-15 15:13:42 -05:00
5a2eafef14
Stuff
2014-02-15 13:22:57 -05:00
b6b0d50937
Update README.md
2014-02-15 09:51:59 +00:00
01e64e43a8
Commit Existing Steamcraft Code
2014-02-15 09:40:05 +00:00
Rares Serban
Rares Serban
Johnny Eatmon
Johnny
Arona Jones