AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 18:30:27 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,671 Commits 29 Branches 143 Tags
Commit Graph

4671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DrummerMC
45ef5bfa7b Added Driver ME Import Bus/Interface 2015-04-05 14:40:09 +02:00
DrummerMC
2eb0c187e6 Changed ME export bus method names 
Added NEI integration for ME export bus
 2015-04-05 14:39:14 +02:00
Florian Nücke
e24e2dfc76 Floppy disks can no longer be "formatted" by shift-rightclicking, added crafting as alternative. 
Simply recrafting a single floppy (no other items in the crafting grid) will now format it. Same for loot disk, they can be converted to normal floppies the same way.
In general, this removes the "shift-right-click to remove NBT tag" functionality, so you also can't format HHDs like this anymore - use `rm /*` or such.
If you notice any items that needed the old functionality (looked through the list, didn't see one), let me know.
 2015-04-05 14:27:46 +02:00
Florian Nücke
7fd0ddac22 Applying Forestry individual converter to item stacks, not just to stuff in analyzer/bee house/apiary/alveary. 2015-04-05 13:56:55 +02:00
Florian Nücke
a213a07c7d Got rid of another non-API reference in the AE2 integration. 2015-04-05 13:41:44 +02:00
Florian Nücke
a1e42e6f8e Added tooltip to prints that serve as beacon prints, to make the recipe self-explanatory when viewed in NEI. 
Added some more notifications: one for when the class transformer errors in general, one if SimpleComponent injection fails.
 2015-04-05 13:37:17 +02:00
Florian Nücke
f85a7ec3dd Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Print.scala
	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
 2015-04-05 01:11:43 +02:00
Florian Nücke
6ac910c2c1 Fixed 3d print preview in WAILA (by using a deprecated method \o/). 2015-04-05 00:55:50 +02:00
Florian Nücke
3251a8ba2f Adjusted export bus driver for AE2 API changes. Closes #997. 
Also got rid of another use of an internal class.
 2015-04-04 19:50:54 +02:00
Florian Nücke
171e58c7b8 Keep the tutorials coming ;-) 2015-04-04 18:49:56 +02:00
Florian Nücke
dc9f5e1008 Cleanup. 2015-04-04 18:45:44 +02:00
Florian Nücke
0d2554e08f Fixed number of returned items from disassembler not taking into account recipe output size. Closes #1017. 2015-04-04 18:20:37 +02:00
Florian Nücke
6f02abad8c Assigning 3D prints to multipart "slots" where they intersect with those areas. Makes them properly block Project Red bundled cables, for example. Closes #1015. 
There are some... interesting cases with multi-state prints and redstone logic (e.g. the printed trapdoor cutting of the power that triggers it), but it shouldn't be a real problem.
 2015-04-04 18:07:50 +02:00
Florian Nücke
e98866473a Updated as per Magik6k's request. 2015-04-04 16:58:05 +02:00
Florian Nücke
f3e151a3ae Finally cleaned up the (almost) eternal makeshift that was handling missing recipes. Recipes can be properly disabled by assigning a boolean value to them; assigning false will also hide the item in the creative tab/NEI, true will only disable the recipe, but keep the item visible. If a recipe is broken, a warning message will now be displayed when entering a world. 2015-04-04 13:49:56 +02:00
Florian Nücke
e8a73e8e9c Adjustments for 1.8. 2015-04-03 18:23:05 +02:00
Florian Nücke
9e2371c7d7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-03 18:18:36 +02:00
Florian Nücke
86cce2502b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-04-03 18:16:40 +02:00
Florian Nücke
2ebced30eb Made Chamelium edible, closes #1001. 2015-04-03 18:16:26 +02:00
Florian Nücke
a6fe2aa754 Fixed 3D prints rendering transparent textures opaque. Closes #1011. 
Note this makes *fully transparent* textures behave properly (like glass), not *translucent* ones (like water), which is a limitation you'll have to live with.
 2015-04-03 17:38:07 +02:00
Florian "Sangar" Nücke
7ee7fb2714 Merge pull request #1009 from xbony2/patch-1 
Update README.md with info for setting up dev-env when using eclipse.
 2015-04-03 01:24:40 +02:00
xbony2
122bbcf201 Update README.md 2015-04-02 19:17:30 -04:00
xbony2
9f4fbea6e4 Update README.md 2015-04-02 19:10:14 -04:00
Florian Nücke
f3879cc7af Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-02 23:02:50 +02:00
Florian Nücke
02b9c48603 Maked redstone i/o block properly wake computers. Closes #1007. 2015-04-02 23:02:32 +02:00
Florian Nücke
cb05f658e5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-02 22:13:01 +02:00
Florian Nücke
681f1f0543 Special thingers. 2015-04-02 22:12:27 +02:00
Florian Nücke
bce128f13c Updated Forge dependency version to the (hopefully?) correct one. 2015-04-01 11:38:40 +02:00
Florian Nücke
36c7127d57 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	.gitignore
 2015-04-01 11:19:18 +02:00
Florian "Sangar" Nücke
66d4356c6e Merge pull request #995 from xbony2/patch-1 
Update .gitignore
 2015-04-01 11:09:53 +02:00
xbony2
5fce10b4e1 Update .gitignore 2015-03-31 21:03:27 -04:00
Florian Nücke
5543fff589 Gaah, debug code begone. 2015-04-01 01:57:34 +02:00
Florian Nücke
a894f97133 Fixes error in power distributor tile entity renderer. 2015-04-01 01:56:39 +02:00
Florian Nücke
765f1dc71e Fixed for MC 1.8. 2015-04-01 00:27:30 +02:00
Florian Nücke
d503fc7ac4 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/integration/vanilla/ConverterItemStack.scala
 2015-04-01 00:26:04 +02:00
Florian Nücke
dcb6cce1d9 Make lore entry of items readable via the item stack converter. 2015-04-01 00:23:46 +02:00
Florian Nücke
517a00941e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-03-31 23:59:03 +02:00
Florian Nücke
4dab10de3f Version bump. 2015-03-31 23:58:43 +02:00
Florian Nücke
27275dce76 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-03-31 23:58:20 +02:00
Florian Nücke
de399541e2 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-03-31 18:13:23 +02:00
Florian Nücke
221f42bb2e Not making mod integration depend on whether power use is enabled or not... closes #992. 2015-03-31 18:12:50 +02:00
Florian "Sangar" Nücke
7a5acd5ad2 Merge pull request #991 from mpmxyz/patch-1 
cat.lua now closes opened files properly
 2015-03-31 17:52:55 +02:00
mpmxyz
063c50033c cat.lua now closes opened files properly 
The title says everything.
It caused a lot of Out of Memory-Errors when I tested a custom file system. (-> many unclosed streams)
 2015-03-31 17:24:11 +02:00
Florian Nücke
ef86ca01c8 Added drivers for the separate RF energy APIs, closes #989. 2015-03-31 13:35:45 +02:00
Florian Nücke
ff85880a96 This *should* fix the NPE in AE2 integration with versions 20 and up. Can't fully test it because it crashes when I interact with terminals. Closes #978. Again. 2015-03-31 01:57:39 +02:00
Florian Nücke
e1ac05b6f3 Fixed reading text on signs via sign upgrade. 2015-03-31 01:13:29 +02:00
Florian Nücke
f834a017c3 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.gradle
	build.properties
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
 2015-03-31 00:50:42 +02:00
Florian Nücke
b021641efe Allow filtering items when querying lists from AE2 networks, closes #856. 
`me_controller.getCraftables` and `me_controller.getItemsInNetwork` now take an optional table argument. This table is a filter applied to the result. Its format is the same as item stack representations. For example, a full filter could be:
```
{
  damage = 0,
  maxDamage = 0,
  size = 12,
  maxSize = 64,
  hasTag = false,
  name = "minecraft:stick,
  label = "Stick"
}
```
 2015-03-31 00:30:07 +02:00
Florian Nücke
f4bcb0718e Populate tablet_use info with sign text if sign upgrade is installed, closes #988. 2015-03-30 23:50:58 +02:00
Florian Nücke
4d5c923c42 Allow recycling prints by using them as material input for printers, closes #986. 2015-03-30 23:36:27 +02:00