AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-19 04:06:43 -04:00
Code Issues Packages Projects Releases Wiki Activity
112 Commits 29 Branches 143 Tags
Commit Graph

112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
66ec34599a Merge branch 'master' of C:\Users\fnuecke\Workspace\OpenComponents-MC1.6.4 into MC1.7 
Conflicts:
	build.gradle
	build.properties
 2014-09-06 17:10:22 +02:00
Florian Nücke
3b15454205 Build script cleanup and improvements. 2014-09-06 17:09:24 +02:00
Florian Nücke
aa4601c276 Build script cleanup. 2014-09-06 16:54:57 +02:00
Florian Nücke
8bd9360bb4 Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7 
Conflicts:
	src/main/java/li/cil/occ/OpenComponents.java
 2014-08-19 17:22:12 +02:00
Florian Nücke
42b96045db Added converter to add Mystcraft book and page specific information to item stack representations. 2014-08-19 17:19:29 +02:00
Florian Nücke
0bff124bcf Updated CoFH APIs and fixed some stuff. 2014-08-08 23:57:31 +02:00
Johannes Lohrer
0669163ea3 more cleaning... 2014-07-26 14:00:21 +02:00
Johannes Lohrer
6cbe51a0c5 removed out of date thaumcraft api 2014-07-26 13:57:42 +02:00
Johannes Lohrer
395aafa03a Re added Forestry, Railcraft and ThermalExpansion 
Closes #20.
 2014-07-26 13:42:29 +02:00
Florian Nücke
b9e4f29267 Corrected link to Jenkins. 2014-07-17 13:39:12 +02:00
Florian Nücke
8f71f5cc26 Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7 2014-07-17 13:37:52 +02:00
Florian Nücke
de4858b18a Merge branch 'master' of github.com:MightyPirates/OpenComponents 2014-07-17 13:37:14 +02:00
Florian Nücke
405cc02c11 Added getter for base EU/t value for IC2 reactors, closes #19. 2014-07-17 13:37:02 +02:00
Florian Nücke
a3f4a9d5c8 Fix #18. 2014-07-12 20:56:00 +02:00
Florian Nücke
a32e771c30 Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7 
Conflicts:
	src/main/java/li/cil/occ/mods/computercraft/DriverPeripheral15.java
	src/main/java/li/cil/occ/mods/computercraft/DriverPeripheral16.java
	src/main/java/li/cil/occ/mods/computercraft/ModComputerCraft.java
 2014-07-03 13:28:23 +02:00
Florian Nücke
793a018080 Added experimental wrapper logic to encapsulate CC's ILuaObject in OC Values (iow: allow CC peripherals to push userdata). 2014-07-03 13:19:37 +02:00
Florian Nücke
38f71b0e71 Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7 
Conflicts:
	build.properties
 2014-06-16 18:50:11 +02:00
Florian Nücke
d6f82ade83 Switched to OC 1.3. 2014-06-16 18:49:16 +02:00
Florian Nücke
a1e9711a14 Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7 
Conflicts:
	build.properties
	src/main/java/li/cil/occ/OpenComponents.java
	src/main/java/li/cil/occ/mods/computercraft/DriverPeripheral15.java
 2014-06-16 18:30:32 +02:00
Florian Nücke
8942ce98c0 Updated OC dependency version. 2014-06-16 18:29:00 +02:00
Florian Nücke
87d4246f71 Updated OC version in dependency. 2014-06-16 18:27:44 +02:00
Felix Treede
03eef7703f Fixed a small derp of mine 2014-06-14 16:51:37 +02:00
Felix Treede
9bedd51e4a Forward load, save and update to IHostedPeripheral 
I'm not sure computercraft itself actually calls these methods, but we
should try to follow the api docs.
 2014-06-14 15:49:05 +02:00
Felix Treede
5f77443c16 Added command block to peripheral blacklist 
We have an own driver for that, we don't need computercraft's one.
 2014-06-14 15:41:00 +02:00
Felix Treede
0e121e763d Fixed CC1.5 peripheral handler 2014-06-14 15:36:02 +02:00
Florian Nücke
6953edffc7 Merge pull request #15 from marcin212/master 
Add hidden Railcraft block to peripheral blacklist.
 2014-06-11 12:25:26 +02:00
marcin212
e08ec58f3a update peripheral blacklist 
Added hidden block from railcraft to peripheral blacklist.
 2014-06-11 02:29:37 +02:00
Florian Nücke
9948741aba Switch to apache logger. 2014-06-10 20:02:42 +02:00
Florian Nücke
493245ec3b Fixes for MC1.7 and re-added peripheral driver (untested). 2014-06-10 20:00:03 +02:00
Florian Nücke
c0c1ba30bf Updated Thaumcraft API. 2014-06-10 19:00:08 +02:00
Florian Nücke
1cd2a0f780 Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7 
Conflicts:
	build.properties
	src/main/java/li/cil/occ/OpenComponents.java
	src/main/java/li/cil/occ/mods/appeng/ModAppEng.java
	src/main/java/li/cil/occ/mods/computercraft/DriverPeripheral.java
	src/main/java/li/cil/occ/mods/computercraft/ModComputerCraft.java
	src/main/java/li/cil/occ/mods/enderstorage/ModEnderStorage.java
	src/main/java/li/cil/occ/mods/railcraft/ModRailcraft.java
	src/main/java/li/cil/occ/mods/redstoneinmotion/ModRedstoneInMotion.java
	src/main/java/li/cil/occ/mods/thermalexpansion/ModThermalExpansion.java
	src/main/java/li/cil/occ/mods/vanilla/DriverFluidHandler.java
 2014-06-10 18:59:24 +02:00
Florian Nücke
445a95c0be Added blacklist setting to disable single mods. 2014-06-10 18:50:02 +02:00
Florian Nücke
74639c22f7 Some cleanup (tabs -> spaces). 2014-06-10 18:40:52 +02:00
marcin212
21ca02276d ninja clean up 2014-06-04 23:02:30 +02:00
marcin212
3164c691f8 Fixed getTankInfo 
It was returning: {n=1}
 2014-06-04 22:58:59 +02:00
marcin212
afd7e0fc44 Added support for Thaumcraft aspect container 
Added Thaumcraft API
 2014-06-03 17:27:42 +02:00
marcin212
ce58f81d1d Added doc for forestry DriverBeeHause. 
Added DriverBoilerFirebox for railcraft.
 2014-06-03 14:22:36 +02:00
Florian Nücke
8459e8cc05 Little bit of cleanup. 2014-05-30 17:58:02 +02:00
Florian Nücke
9762a31bfa Merge pull request #13 from marcin212/master 
Support for forestry and inventory methods enhancement
 2014-05-30 17:43:22 +02:00
marcin212
161174480a Fixed: 
-method GetStackInSlot
	-method GetAllStacks
	-support for Forestry apiary
 2014-05-28 02:16:06 +02:00
marcin212
f9a7818908 Added: 
-method GetStackInSlot
	-method GetAllStacks
	-support for Forestry apiary
 2014-05-27 01:07:40 +02:00
Johannes Lohrer
4c06cb59e6 blacklisted AE TileEntities for OpenPeripherals 2014-05-25 17:57:26 +02:00
Florian Nücke
0271a8fc92 Also convert CellInventoryHandler. 2014-04-21 16:11:19 +02:00
Florian Nücke
95fb13278e Cleanup, mostly formatting and tabs -> spaces. 
Removed part of the AE2 API that made it fail to compile because of a missing class...
Bumped version number.
Fixed accessibility of CellContainer driver.
 2014-04-21 15:09:16 +02:00
Florian Nücke
9ff4f6adb7 Merge pull request #7 from boomshroom/MC1.7 
Re-added Applied Energistics addon
 2014-04-21 14:43:25 +02:00
boomshroom
6882d366c0 Added AppEng2 addon to main class 2014-04-18 10:24:34 -07:00
boomshroom
72caabde72 Readded Applied Energistics addon with new Applied Energistics 2 api. 2014-04-18 10:19:10 -07:00
Florian Nücke
b687104aa7 Supressing warning for CC1.5/1.6 if CC1.6/1.5 is present. 
Fixed CC1.5 support.
 2014-04-13 15:37:11 +02:00
Florian Nücke
c199cbdd37 Backwards compatibility for CC1.5. It's copy-pasta, but it works. 2014-04-05 16:28:57 +02:00
Florian Nücke
aebffedb4f Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7 
Conflicts:
	build.properties
	gradle/forge.gradle
	src/api/java/dan200/computercraft/api/filesystem/IMount.java
	src/api/java/dan200/computercraft/api/filesystem/IWritableMount.java
	src/api/java/dan200/computercraft/api/lua/ILuaContext.java
	src/api/java/dan200/computercraft/api/lua/ILuaObject.java
	src/api/java/dan200/computercraft/api/media/IMedia.java
	src/api/java/dan200/computercraft/api/peripheral/IComputerAccess.java
	src/api/java/dan200/computercraft/api/peripheral/IPeripheral.java
	src/api/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java
	src/api/java/dan200/computercraft/api/turtle/TurtleSide.java
	src/api/java/dan200/computercraft/api/turtle/TurtleUpgradeType.java
	src/api/java/dan200/computercraft/api/turtle/TurtleVerb.java
	src/main/java/li/cil/occ/OpenComponents.java
	src/main/java/li/cil/occ/mods/computercraft/DriverPeripheral.java
 2014-03-29 16:30:16 +01:00