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

75 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
21c5cb164a updated to CC 1.6 API 2014-03-29 16:16:42 +01:00
Florian Nücke
8ffb1d210a Merge pull request #3 from Matchlighter/master 
Clean up some console spam.
 2014-03-26 19:17:12 +01:00
Matchlighter
6097ba1d53 Clean up some console spam. 2014-03-25 22:21:35 -06:00
Florian Nücke
5fcf207ad7 Merge pull request #2 from Matchlighter/master 
Made DriverPeripheral compatible with IPeripheralHandler/IHostedPeripheral.
 2014-03-25 12:49:41 +01:00
Matchlighter
964f7da719 Made DriverPeripheral compatible with 
IPeripheralHandler/IHostedPeripheral.
 2014-03-24 19:50:40 -06:00
Florian Nücke
cb75c6e703 removed Atomic Science API since it no longer exists in the latest AS build, OC support will be added directly 2014-03-15 18:49:38 +01:00
Florian Nücke
4a7c981e62 removed conversion stuff in favor of type converters in oc, registering converters for ic2 and te energy items; made a couple of block specific drivers named 2014-03-14 16:06:27 +01:00
Florian Nücke
fcbfc037bb auto-version in mcmod.info 2014-03-14 14:48:28 +01:00
Florian Nücke
74be09d6e4 adjusted paths for gradle; made it build 2014-03-14 14:19:18 +01:00
Florian Nücke
7b28339e7f let the gradling begin 2014-03-14 13:58:50 +01:00
Johannes Lohrer
4be526c6ef added some more mod docs 2014-02-20 00:08:03 +01:00
Johannes Lohrer
ee8b7c2f61 Merge branch 'master' of github.com:MightyPirates/OpenComponents 2014-02-19 20:33:21 +01:00
Johannes Lohrer
7818b69ff7 Added BuildCraft doc 2014-02-18 21:14:38 +01:00
Johannes Lohrer
44f18c427d Doc for AtomicScience 2014-02-18 21:01:35 +01:00
Florian Nücke
b3dae6363c formatting; minor adjustments (returning lists as tables instead of result tuples) 2014-02-17 21:56:38 +01:00
Florian Nücke
c30bae21bc Merge branch 'master' of https://github.com/MightyPirates/OpenComponents 2014-02-17 21:22:07 +01:00
Johannes Lohrer
8dd20ee672 added documentation for AppEng 2014-02-16 23:05:01 +01:00
Florian Nücke
2e69f454ac another false->null/nil 2014-02-16 22:48:51 +01:00
Florian Nücke
0e31b4bca3 added download link (jenkins) to readme 2014-02-13 21:43:10 +01:00
Florian Nücke
13a8b75573 moved all peripheral wrapping logic over to here 2014-02-10 18:23:12 +01:00
Florian Nücke
48d17315fc undid weird replace in railcraft api (wtf?) and some minor cleanup 2014-02-10 03:19:45 +01:00
Florian Nücke
a4898e269d Merge branch 'master' of https://github.com/MightyPirates/OpenComponents 2014-02-10 03:10:48 +01:00
Florian Nücke
b442981fbf added check to avoid duplicate components when a block next to the adapter already has an environment interface in addition to a peripheral interface 2014-02-10 03:10:30 +01:00
Johannes Lohrer
61dc9b78f1 Merge branch 'master' of github.com:MightyPirates/OpenComponents 
Conflicts:
	src/main/java/li/cil/occ/OpenComponents.java
 2014-02-09 00:28:23 +01:00
Johannes Lohrer
08561dc720 Added Railcraft, TMechworks 2014-02-09 00:27:08 +01:00
Florian Nücke
0b3c9ddecd cleaned up after peripheral redesign 2014-02-08 22:45:19 +01:00
Florian Nücke
2636f02400 Merge branch 'master' of https://github.com/MightyPirates/OpenComponents 2014-02-08 22:30:04 +01:00
Florian Nücke
98cbaffca6 cc peripherals are now wrapped by default and can be disabled using a blacklist (in the config) 2014-02-08 22:29:39 +01:00
Johannes Lohrer
704bb64ce1 added MassFab and Lamp 2014-02-08 19:48:36 +01:00
Florian Nücke
8da6b4bd98 yet more refactoring! 2014-02-08 19:19:31 +01:00
Florian Nücke
f28257a049 me so indecisive 2014-02-08 19:18:19 +01:00
Florian Nücke
4dc5be944f more refactoring 2014-02-08 19:14:16 +01:00
Florian Nücke
3e879f5473 Merge branch 'master' of https://github.com/MightyPirates/OpenComponents 
Conflicts:
	src/main/java/li/cil/occ/OpenComponents.java
 2014-02-08 19:03:25 +01:00