Skip to content

Commit 1b23387

Browse files
committedMay 15, 2016
Merge remote-tracking branch 'origin/serverrackthings' into soundcard
Conflicts: src/main/java/pl/asie/computronics/item/ItemOpenComputers.java src/main/java/pl/asie/computronics/oc/IntegrationOpenComputers.java src/main/java/pl/asie/computronics/reference/Config.java
2 parents a3eff11 + 8460e6d commit 1b23387

File tree

106 files changed

+1586
-360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1586
-360
lines changed
 

‎build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ enderio.version=1.7.10-2.3.0.424_beta
1111
forestry.version=4.2.0.47
1212
gregtech.version=5.07.07
1313
ic2.version=2.2.643-experimental
14-
oc.version=MC1.7.10-1.5.21.41
14+
oc.version=MC1.7.10-1.6.0.892-dev
1515
qmunitylib.version=0.1.109
1616
tis3d.version=MC1.7.10-0.8.2.61
1717
waila.version=1.5.10_1.7.10

‎changelog.md

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
- This allows you to monitor input and output of your energy network separately
2020
- Now you can get and set the range of Vacuum Chests
2121
- Added `getProgress()` to most machines with progress
22+
* ADDED: OpenComputers 1.6 integration (requires OpenComputers 1.6.0 now)
23+
- Added a Light Board to put into Server Racks. Allows controlling coloured lights in various layouts.
24+
- Added a Server Self-Destructor in case you don't need your servers anymore.
25+
- Added a Rack Capacitor which is a Capacitor you can put into a Rack. Ingenious. It also provides a component that gives you the amount of energy stored in that capacitor.
2226
* ADDED: Built-in tape utility program for ComputerCraft to write songs to tapes and to play, stop, pause etc.
2327
* ADDED: getPosition() to tape drives. No, I'm not joking. It's real. I'm sorry.
2428
* ADDED: Digital Signal Controller Box for Railcraft!

0 commit comments

Comments
 (0)