AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-13 01:10:19 -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
Florian Nücke
a4214910c4 Some print->io.write. 2015-05-01 10:08:20 +02:00
Florian Nücke
27e32a0dc9 Forgot dem excludes. 2015-04-30 13:46:17 +02:00
Florian Nücke
e310d16b03 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-30 13:35:52 +02:00
Florian Nücke
bb4718034c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/integration/vanilla/ModVanilla.scala
	src/main/scala/li/cil/oc/util/ExtendedWorld.scala
 2015-04-30 13:35:43 +02:00
Florian Nücke
cf89399cb5 Fixed derp in previous commit >_> 2015-04-30 13:33:25 +02:00
Florian Nücke
76b015c308 Fixed redstone input computation. 2015-04-30 13:27:34 +02:00
Florian Nücke
852c5b18db Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.gradle
	src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala
	src/main/scala/li/cil/oc/common/Loot.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
	src/main/scala/li/cil/oc/integration/Mods.scala
	src/main/scala/li/cil/oc/util/Audio.scala
 2015-04-30 12:47:33 +02:00
Florian Nücke
1e642a0a24 Added fallback beeping when failing to generate tones, using MC note sound. Closes #1023. 
May not work, and some nuance is lost (beep length), but it's still better than nothing.
 2015-04-30 12:23:04 +02:00
Florian Nücke
7d69f996cb Added handling for OOM errors when allocating hologram rendering data. Closes #1105. 2015-04-30 11:44:47 +02:00
Florian Nücke
d5f1280fc9 Added beep(short, short) and beep(String) to the Machine interface. Closes #1112. 
Allows architectures (and components or anything else for that matter) to play custom tones and beep patterns.
 2015-04-30 11:33:13 +02:00
Florian Nücke
495f341181 Make safe subset of debug.getinfo available in sandbox. Closes #1110. 2015-04-30 11:18:19 +02:00
Florian Nücke
2b0da714c7 Merge branch 'master-MC1.7.10' of https://github.com/Kubuxu/OpenComputers into master-MC1.7.10 2015-04-29 22:23:28 +02:00
Kubuxu
4c4051540b Make dmesg use new event capabilities. 2015-04-29 18:38:03 +02:00
Florian Nücke
f78d5a4277 Fixed potential log spam in disassembler. Closes #1107. 2015-04-29 18:24:42 +02:00
Kubuxu
4a036f89e3 Implement event.pullMultiple and event.pullFiltered 2015-04-29 18:20:29 +02:00
Florian Nücke
8b149e1df6 Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10 2015-04-29 16:19:37 +02:00
Florian Nücke
cb704dab33 Basic integration for IGWMod, providing manual pages for blocks and items. 2015-04-29 16:19:08 +02:00
Florian Nücke
15cc9a7146 Caching redstone devices for bluepower. 2015-04-29 16:18:21 +02:00
Florian Nücke
2886fdcd4d Reworked redstone logic to make it more modular. 2015-04-27 21:16:41 +02:00
Florian Nücke
4956271d62 Added support for BluePower's bundled redstone system. Closes #1103. 2015-04-27 20:34:47 +02:00
cyber01
a30f2d1295 Corrected mistakes 2015-04-27 19:04:05 +03:00
cyber01
6c85fd8e10 Added waypoint. Corrected mistakes 2015-04-27 19:01:39 +03:00
Florian Nücke
636a67cded Fixed another potential NPE. Probably. 2015-04-26 18:25:20 +02:00
Florian Nücke
673f3d9a8f Fixed potential NPE in rotatable class... probably. 
Dem race conditions.
 2015-04-26 18:03:39 +02:00
Florian Nücke
f7ff8afdab Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/server/component/UpgradeNavigation.scala
 2015-04-26 17:57:08 +02:00
Florian Nücke
e547c877d2 Closing waypoint GUI when confirming new label. 2015-04-26 17:56:35 +02:00
Florian Nücke
65cd4d1230 Adjustments for 1.8. 2015-04-26 17:55:49 +02:00
Florian Nücke
0e995faa8a Mentioning waypoint in nav upgrade's manual entry. 2015-04-26 17:54:09 +02:00
Florian Nücke
6ee9e332e8 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/common/event/RobotCommonHandler.scala
	src/main/scala/li/cil/oc/common/init/Blocks.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala
 2015-04-26 17:20:42 +02:00
Florian Nücke
5672cf8dc8 Added waypoint block, can be queried using navigation upgrades. 
Fixed drones losing their name when changing their EEPROM.
 2015-04-26 16:24:40 +02:00
Florian Nücke
226fa52315 Blacklisting hover upgrade in non-robot devices. 2015-04-25 23:42:19 +02:00
Florian Nücke
e6fca46ccc Merge branch 'patch-1' of https://github.com/Mstrodl/OpenComputers into master-MC1.7.10 2015-04-25 23:39:42 +02:00
Florian Nücke
01f63f7e90 Added hover upgrade to allow increasing robot flight height (tier two allows unlimited flight height, like it was in the olden days). 2015-04-25 23:39:04 +02:00
Florian Nücke
f11285812f Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-24 17:39:17 +02:00
Florian Nücke
8ee8309cb7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/item/UpgradeBattery.scala
	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
	src/main/scala/li/cil/oc/integration/cofh/energy/EventHandlerRedstoneFlux.scala
	src/main/scala/li/cil/oc/integration/ic2/EventHandlerIndustrialCraft2.scala
 2015-04-24 17:39:04 +02:00
Florian Nücke
da7a5c6eb8 Fixed charger if power use is disabled. 2015-04-24 17:38:18 +02:00
Florian Nücke
76bb3a49cf Fixed wrench tool registration. 2015-04-24 17:23:40 +02:00
Florian Nücke
69ee8263e5 Spawning OpenOS floppy in creative tablets in its container upgrade now. 2015-04-24 17:22:58 +02:00
Florian Nücke
62e54377b6 Made charger more generic to allow charging addon items. Also allow charging battery upgrades in the charger now. 
Specifically, added `Chargeable` interface that can be implemented on items. This is what's used to actually charge items. This way the charger is also to (very slowly) charge items from other mods; built-in integration for now is for IEnergyContainerItem (CoFH) and IElectricItem (IC2).
Addon items can also provide an environment to be connected to the charger's network by providing an item driver that generates such an environment and has the slot type `Tablet`.
 2015-04-24 17:22:24 +02:00
Florian Nücke
cdbce01aad Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
 2015-04-23 21:39:02 +02:00
Florian Nücke
043548e78e Removed broken workaround for not progressing robot hover animation when game is paused. Closes #1101. 
Because the bug in Mystcraft the workaround was required for in the first place has been fixed. \o/
 2015-04-23 21:37:49 +02:00
Florian Nücke
83bd1bee7e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/java/li/cil/oc/api/event/RobotRenderEvent.java
 2015-04-23 18:55:23 +02:00
Florian Nücke
d52ed578b7 Add mount point name to mount point class. 
Allow template's assemble to return a `Number`, not only `Double`s.
 2015-04-23 18:54:12 +02:00
Florian Nücke
7ef18782d7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-23 10:15:46 +02:00
Florian Nücke
fef2784141 Seems like implementing a SideOnly interface makes the whole class SideOnly, instead of just stripping the interface... oh well. Closes #1098. 2015-04-23 10:15:24 +02:00
Florian Nücke
af6f781ec6 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
 2015-04-22 23:28:40 +02:00
Florian Nücke
1528a6ee24 Scratch that and let's do it again. Might silence the voices in my head (aka @Vexatos). 
Changed robot upgrade rendering to allow being picky. A bit more overhead, but hey, what's a few sets among friends?
 2015-04-22 23:26:41 +02:00
Florian Nücke
a9448556a0 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
 2015-04-22 18:44:32 +02:00
Florian Nücke
fda54f2f6f All right then, have a few methods to allow influencing which mount point to render your upgrades in. 2015-04-22 18:42:50 +02:00
Florian Nücke
7a0a7e9b3e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/common/item/Delegator.scala
	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverFileSystem.scala
	src/main/scala/li/cil/oc/server/fs/FileSystem.scala
 2015-04-22 18:06:37 +02:00