AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-22 20:05:11 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,340 Commits 29 Branches 143 Tags
Commit Graph

2340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
dc2784770a Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Keyboard.scala
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
 2014-07-19 13:40:34 +02:00
Florian Nücke
9d49a98db7 Some cleanup. 2014-07-19 13:37:02 +02:00
Florian Nücke
5f19433ba8 Centralizing use of sided checks to make it easier to swap out for testing in the future, and added some hackiness to maybe make it more stable. 2014-07-19 13:29:45 +02:00
Florian Nücke
fe4444dacc Revert "Trying to get rid of FMLCommonHandler.instance.getEffectiveSide where possible, since it can apparently fail in some scenarios." 
This reverts commit b3813bc4f563a4066fd79db1dad16db3673bb324.

And a few more related commits. Turns out this was caused by some Bukkit plugin, tho it is still unknown which one exactly.

Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
 2014-07-19 13:17:33 +02:00
Florian Nücke
b56f6576fb Merge pull request #418 from Vexatos/patch-9 
Update oppm.lua
 2014-07-19 12:37:42 +02:00
Vexatos
86c580ad58 Update oppm.lua 2014-07-19 11:26:44 +02:00
istasi
435fccd9eb Update ls.lua 2014-07-18 15:20:23 +02:00
istasi
f269d19245 Update ls.lua 2014-07-18 14:48:50 +02:00
istasi
33eb85d0bb Update df.lua 2014-07-18 13:32:12 +02:00
Florian Nücke
23be2a7ebd Cleaned up components.lua a little and allowing to specify multiple filters (each argument is used as filter) and only printing methods for -l. 2014-07-18 13:06:41 +02:00
istasi
6decdde934 Update df.lua 2014-07-18 12:53:19 +02:00
istasi
bad2f94ca0 Update components.lua 2014-07-17 23:43:39 +02:00
Florian Nücke
d37ccc9e28 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-17 18:06:57 +02:00
Florian Nücke
1004c9572b Fixed a potential issue when new characters were loaded into the font lookup-texture and the char is a wide char that doesn't fit into the last row of the texture. 
It would have been rendered 'outside' the texture, leading to the char being incorrectly displayed. Now checking for this case, too, and creating new texture instead.
 2014-07-17 18:06:41 +02:00
Florian Nücke
3dd3eed915 Removed more stuff from new font renderer that's no longer needed. 2014-07-17 18:00:29 +02:00
Florian Nücke
eadc882d8a Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-17 17:52:54 +02:00
Florian Nücke
35116c26cb Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-17 17:52:41 +02:00
Florian Nücke
d1e3fcdc12 Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-17 17:52:16 +02:00
Florian Nücke
db2b443f51 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-17 17:51:56 +02:00
Florian Nücke
15125cc4b6 More mysterious NPEs! 2014-07-17 17:51:34 +02:00
Florian Nücke
728f8ed831 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Switch.scala
 2014-07-17 17:19:47 +02:00
Florian Nücke
421e204523 Organize imports. 2014-07-17 17:18:59 +02:00
Florian Nücke
827e30abea Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/java/li/cil/oc/common/asm/SimpleComponentTickHandler.java
	src/main/resources/mcmod.info
	src/main/scala/li/cil/oc/client/Proxy.scala
	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/EventHandler.scala
	src/main/scala/li/cil/oc/common/block/MotionSensor.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/common/tileentity/Switch.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
 2014-07-17 17:17:26 +02:00
Florian Nücke
ca5b3805ba Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-17 17:09:16 +02:00
Florian Nücke
1879706f3e Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-17 17:08:56 +02:00
Florian Nücke
31614223ce Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-17 17:08:37 +02:00
Florian Nücke
81bdce12be Fix potential NPE. 2014-07-17 17:07:53 +02:00
Florian Nücke
e8eb3a4453 Updated for the side check change. 2014-07-17 17:03:13 +02:00
Florian Nücke
ef0034742c Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-17 17:02:57 +02:00
Florian Nücke
70dbb33d46 Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-17 17:02:37 +02:00
Florian Nücke
02f8acc82a Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-17 17:02:19 +02:00
Florian Nücke
78c6d01051 Fix for version injection into config after file name change. 2014-07-17 17:01:27 +02:00
Florian Nücke
e054012e1b Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-1.3-MC1.6.4 
Conflicts:
	src/main/scala/li/cil/oc/common/block/AccessPoint.scala
	src/main/scala/li/cil/oc/common/block/Hologram.scala
	src/main/scala/li/cil/oc/common/block/Redstone.scala
	src/main/scala/li/cil/oc/common/block/ServerRack.scala
	src/main/scala/li/cil/oc/common/block/Switch.scala
	src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/common/tileentity/Switch.scala
 2014-07-17 16:30:09 +02:00
Florian Nücke
5c7be3ec47 Merge branch 'OC1.3-MC1.7.2' of C:\Users\fnuecke\Workspace\OpenComputers-1.3-MC1.7.2 into OC1.3-MC1.7.10 2014-07-17 16:24:01 +02:00
Florian Nücke
09332db963 Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-1.3-MC1.6.4 into OC1.3-MC1.7.2 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/multipart/CablePart.scala
 2014-07-17 16:23:23 +02:00
Florian Nücke
738bcb5954 Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-dev-MC1.6.4 into OC1.3-MC1.6.4 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
 2014-07-17 16:22:06 +02:00
Florian Nücke
20443f54e9 Fixes for the adjusted side checks. 2014-07-17 16:16:31 +02:00
Florian Nücke
83a79ad314 Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-dev-MC1.6.4 into OC1.3-MC1.7.2 
Conflicts:
	src/main/java/li/cil/oc/common/asm/SimpleComponentTickHandler.java
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
 2014-07-17 16:07:26 +02:00
Florian Nücke
93218f4ff7 The Optional.Method annotation seems to not work in dev-env in some cases... trying to work around that to fix absence of FMP and Waila related crashes in dev-env. 2014-07-17 16:02:36 +02:00
Florian Nücke
b3813bc4f5 Trying to get rid of FMLCommonHandler.instance.getEffectiveSide where possible, since it can apparently fail in some scenarios. 2014-07-17 15:15:26 +02:00
Florian Nücke
11592e6b72 Minor refactoring. 2014-07-17 14:43:22 +02:00
Florian Nücke
1cfd1cfb12 Adjusted for 1.7. 2014-07-16 21:33:05 +02:00
Florian Nücke
653e281ee4 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-16 21:30:16 +02:00
Florian Nücke
14ff4ce9d4 Added visual indicator for disks in disk drives (they 'stand out' a bit now). 2014-07-16 21:27:09 +02:00
Florian Nücke
9590cf54ae Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/gui/Switch.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/block/AccessPoint.scala
	src/main/scala/li/cil/oc/common/block/Adapter.scala
	src/main/scala/li/cil/oc/common/block/Cable.scala
	src/main/scala/li/cil/oc/common/block/Capacitor.scala
	src/main/scala/li/cil/oc/common/block/Delegate.scala
	src/main/scala/li/cil/oc/common/block/Geolyzer.scala
	src/main/scala/li/cil/oc/common/block/Keyboard.scala
	src/main/scala/li/cil/oc/common/block/MotionSensor.scala
	src/main/scala/li/cil/oc/common/block/PowerConverter.scala
	src/main/scala/li/cil/oc/common/block/PowerDistributor.scala
	src/main/scala/li/cil/oc/common/block/Redstone.scala
	src/main/scala/li/cil/oc/common/block/ServerRack.scala
	src/main/scala/li/cil/oc/common/inventory/ServerInventory.scala
	src/main/scala/li/cil/oc/common/item/Memory.scala
	src/main/scala/li/cil/oc/common/item/RedstoneCard.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/item/Terminal.scala
	src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
	src/main/scala/li/cil/oc/common/tileentity/Case.scala
	src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala
	src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
	src/main/scala/li/cil/oc/common/tileentity/RobotAssembler.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/common/tileentity/Switch.scala
	src/main/scala/li/cil/oc/server/PacketHandler.scala
 2014-07-16 19:02:26 +02:00
Florian Nücke
9964575414 Localized strings for switch GUI. 2014-07-16 18:38:01 +02:00
Florian Nücke
e0c22f0279 Potential fix for #409. 2014-07-16 18:21:55 +02:00
Florian Nücke
7149eeabc4 Fixed robots bouncing back network messages. 2014-07-16 18:05:18 +02:00
Florian Nücke
8cc4232424 Generified inventory name stuffs, will make this less conflict-prone with MC1.7 in the future. 2014-07-16 17:55:47 +02:00
Florian Nücke
4f289cd15f Getting rid of a crapton of redundant code. BEWARE: resulted in most textures being renamed! 2014-07-16 17:43:09 +02:00